diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml b/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml index ba034d74291..0f618115991 100644 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml +++ b/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml @@ -715,6 +715,7 @@ + diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp index 4e0829c02f1..d0280b8be9b 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp +++ b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp @@ -8,11 +8,20 @@ <%@page import="org.exoplatform.commons.api.settings.SettingService"%> <%@page import="org.exoplatform.social.core.space.SpacesAdministrationService"%> <%@page import="org.exoplatform.container.ExoContainerContext"%> +<%@ page import="org.exoplatform.services.security.ConversationState" %> +<%@ page import="org.exoplatform.commons.api.settings.ExoFeatureService" %> +<%@ page import="org.exoplatform.commons.utils.CommonsUtils"%> +<%@ page import="org.exoplatform.services.security.Identity"%> <% boolean canCreateSpace = ExoContainerContext.getService(SpacesAdministrationService.class).canCreateSpace(request.getRemoteUser()); SettingValue stickySettingValue = ExoContainerContext.getService(SettingService.class).get(Context.USER.id(request.getRemoteUser()), Scope.APPLICATION.id("HamburgerMenu"), "Sticky"); boolean sticky = stickySettingValue == null ? Boolean.parseBoolean(System.getProperty("io.meeds.userPrefs.HamburgerMenu.sticky", "false")) : Boolean.parseBoolean(stickySettingValue.getValue().toString()); + ExoFeatureService featureService = CommonsUtils.getService(ExoFeatureService.class); + Identity currentIdentity = ConversationState.getCurrent().getIdentity(); + String currentUser = currentIdentity.getUserId(); + boolean newLeftNavigationDrawer = featureService.isFeatureActiveForUser("newLeftNavigationDrawer", currentUser); + PortalRequestContext rcontext = (PortalRequestContext) PortalRequestContext.getCurrentInstance(); PortalHttpServletResponseWrapper responseWrapper = (PortalHttpServletResponseWrapper) rcontext.getResponse(); @@ -53,6 +62,7 @@ <% } %>