From f03552714077df2a3f11fe33a81342558dfe1705 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 18 Aug 2017 14:37:47 -0400 Subject: 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) --- .../org/openecomp/portalapp/controller/core/FnMenuController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ecomp-sdk/epsdk-app-common') 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"); -- cgit 1.2.3-korg