Commit 8ac5d618 authored by Marco Balestri's avatar Marco Balestri
Browse files

[KNOWAGE-6708] Adds management of document browser

parent af4fafa2
...@@ -45,9 +45,7 @@ import it.eng.spago.error.EMFUserError; ...@@ -45,9 +45,7 @@ import it.eng.spago.error.EMFUserError;
import it.eng.spago.security.IEngUserProfile; import it.eng.spago.security.IEngUserProfile;
import it.eng.spago.validation.EMFValidationError; import it.eng.spago.validation.EMFValidationError;
import it.eng.spagobi.analiticalmodel.document.bo.BIObject; import it.eng.spagobi.analiticalmodel.document.bo.BIObject;
import it.eng.spagobi.analiticalmodel.document.service.BIObjectsModule;
import it.eng.spagobi.analiticalmodel.functionalitytree.bo.LowFunctionality; import it.eng.spagobi.analiticalmodel.functionalitytree.bo.LowFunctionality;
import it.eng.spagobi.analiticalmodel.functionalitytree.service.TreeObjectsModule;
import it.eng.spagobi.commons.bo.Role; import it.eng.spagobi.commons.bo.Role;
import it.eng.spagobi.commons.constants.AdmintoolsConstants; import it.eng.spagobi.commons.constants.AdmintoolsConstants;
import it.eng.spagobi.commons.constants.SpagoBIConstants; import it.eng.spagobi.commons.constants.SpagoBIConstants;
...@@ -647,14 +645,18 @@ public class DetailMenuModule extends AbstractHttpModule { ...@@ -647,14 +645,18 @@ public class DetailMenuModule extends AbstractHttpModule {
// + initialPath; // + initialPath;
String idsPath = convertPathInIds(initialPath); String idsPath = convertPathInIds(initialPath);
url += "&" + BIObjectsModule.MODALITY + "=" + BIObjectsModule.FILTER_TREE + "&" + TreeObjectsModule.PATH_SUBTREE + "=" + initialPath // url += "&" + BIObjectsModule.MODALITY + "=" + BIObjectsModule.FILTER_TREE + "&" + TreeObjectsModule.PATH_SUBTREE + "=" + initialPath
+ idsPath; // + idsPath;
} }
} else if (functionality.equals(SpagoBIConstants.WORKSPACE_MANAGEMENT)) { } else if (functionality.equals(SpagoBIConstants.WORKSPACE_MANAGEMENT)) {
String initialPath = menu.getInitialPath(); String initialPath = menu.getInitialPath();
if (initialPath != null && initialPath.equals("documents")) { if (initialPath != null && initialPath.equals("documents")) {
url += "/recent"; url += "/recent";
} else if (initialPath != null && initialPath.equals("datasets")) {
url += "/data";
} else if (initialPath != null && initialPath.equals("models")) {
url += "/models";
} }
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<APPLICATION code="DocumentUserBrowser" <APPLICATION code="DocumentUserBrowser"
title="#menu.DocumentUserBrowser" title="#menu.DocumentUserBrowser"
functionality="DocumentUserBrowser" functionality="DocumentUserBrowser"
link="${SPAGOBI_CONTEXT}${SPAGO_ADAPTER_HTTP}?ACTION_NAME=DOCUMENT_USER_BROWSER_START_ANGULAR_ACTION" link="/document-browser"
iconCls="fa fa-2x fa-folder-o" iconCls="fa fa-2x fa-folder-o"
iconUrl="${SPAGOBI_CONTEXT}/img/wapp/bidocuments16.png"> iconUrl="${SPAGOBI_CONTEXT}/img/wapp/bidocuments16.png">
</APPLICATION> </APPLICATION>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment