summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-common/src
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-08-18 14:37:47 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-08-18 14:39:46 -0400
commitf03552714077df2a3f11fe33a81342558dfe1705 (patch)
tree2ad3b77f2b1fd1f0390a7d4614cd3d050b6f6f38 /ecomp-sdk/epsdk-app-common/src
parenta2f5a35c06a526b05e4efd9fe275d6639bf22cd3 (diff)
Repair centralized-role feature.
Also show ONAP logo in EPSDK-app header top left. Issue: PORTAL-21, PORTAL-81 Change-Id: I46953123219d4f7a239ca6c5a05890a3769ed2ea Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-common/src')
-rw-r--r--ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
index 5082dad5..78c1440d 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
@@ -34,6 +34,7 @@ import org.openecomp.portalsdk.core.domain.Menu;
import org.openecomp.portalsdk.core.domain.MenuData;
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.openecomp.portalsdk.core.service.FnMenuService;
+import org.openecomp.portalsdk.core.service.FunctionalMenuListService;
import org.openecomp.portalsdk.core.util.SystemProperties;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,9 @@ public class FnMenuController extends RestrictedBaseController {
@Autowired
FnMenuService service;
+
+ @Autowired
+ FunctionalMenuListService functionalMenuListService;
private String viewName;
@@ -79,7 +83,7 @@ public class FnMenuController extends RestrictedBaseController {
public void getFunctionCDList(HttpServletRequest request, HttpServletResponse response) throws Exception {
ObjectMapper mapper = new ObjectMapper();
try {
- response.getWriter().write(mapper.writeValueAsString(service.getFunctionCDList(request)));
+ response.getWriter().write(mapper.writeValueAsString(functionalMenuListService.getFunctionCDList(request)));
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "getFunctionCDList", e);
response.setCharacterEncoding("UTF-8");