improved breadcrumbs handling for "self" pages

Evolveum · Apr 11, 2016 · 5cf4f3f · 5cf4f3f
1 parent 85e32f3
commit 5cf4f3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -1457,6 +1457,13 @@ public AdminGuiConfigurationType loadAdminGuiConfiguration() {
 	public void redirectBack() {
 		List<Breadcrumb> breadcrumbs = getSessionStorage().getBreadcrumbs();
 		if (breadcrumbs.size() < 2) {
+			if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
+					AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
+				setResponsePage(PageDashboard.class);
+			} else {
+				setResponsePage(PageSelfDashboard.class);
+			}
+
 			return;
 		}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
@@ -398,12 +398,7 @@ private List<PasswordAccountDto> getSelectedAccountsList(){
         return selectedAccountList;
     }
     private void onCancelPerformed(AjaxRequestTarget target) {
-        if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
-                AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
-            setResponsePage(PageDashboard.class);
-        } else {
-            setResponsePage(PageSelfDashboard.class);
-        }
+        redirectBack();
     }
 
     private List<ShadowType> loadShadowTypeList() {