self profile page opening fix

Evolveum · Aug 25, 2021 · 5f2b15b · 5f2b15b
1 parent a344684
commit 5f2b15b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -191,8 +191,10 @@ private SideBarMenuItem createSelfServiceMenu(boolean experimentalFeaturesEnable
         SideBarMenuItem menu = new SideBarMenuItem("PageAdmin.menu.selfService", experimentalFeaturesEnabled);
         menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.selfDashboard", GuiStyleConstants.CLASS_ICON_DASHBOARD,
                 PageSelfDashboard.class));
+        PageParameters pageParameters = new PageParameters();
+        pageParameters.add(OnePageParameterEncoder.PARAMETER, WebModelServiceUtils.getLoggedInFocusOid());
         menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.profile", GuiStyleConstants.CLASS_ICON_PROFILE,
-                WebComponentUtil.resolveSelfPage()));
+                WebComponentUtil.resolveSelfPage(), pageParameters));
         menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.credentials", GuiStyleConstants.CLASS_ICON_CREDENTIALS,
                 PageSelfCredentials.class));
         if (WebModelServiceUtils.getLoggedInFocus() instanceof UserType) {
@@ -683,6 +685,10 @@ private MainMenuItem createMainMenuItem(String key, String icon, Class<? extends
         return new MainMenuItem(key, icon, page);
     }
 
+    private MainMenuItem createMainMenuItem(String key, String icon, Class<? extends PageBase> page, PageParameters params) {
+        return new MainMenuItem(key, icon, page, params);
+    }
+
     public List<SideBarMenuItem> getItems() {
         SideBarMenuPanel sideBarMenuPanel = (SideBarMenuPanel) get(ID_MENU);
         return sideBarMenuPanel.getModelObject();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuItem.java
@@ -18,6 +18,8 @@
 import com.evolveum.midpoint.util.annotation.Experimental;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
 
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
 /**
  * @author Viliam Repan (lazyman)
  */
@@ -35,8 +37,11 @@ public MainMenuItem(String name, String iconClass) {
     }
 
     public MainMenuItem(String name, String iconClass, Class<? extends PageBase> page) {
-        super(name, iconClass, page, null);
+        this(name, iconClass, page, null);
+    }
 
+    public MainMenuItem(String name, String iconClass, Class<? extends PageBase> page, PageParameters params) {
+        super(name, iconClass, page, params);
     }
 
     private List<MenuItem> getItems() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageUserSelfProfile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageUserSelfProfile.java
@@ -46,7 +46,6 @@ public PageUserSelfProfile() {
 
     }
 
-    //TODO is this even used??
     public PageUserSelfProfile(PageParameters parameters) {
         super(parameters);
     }