breadcrumbs error pages handling improved, not finished yet

Evolveum · Mar 13, 2016 · 5267db0 · 5267db0
1 parent 978e708
commit 5267db0
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -131,7 +131,7 @@
 	                <span class="page-title" wicket:id="pageTitle">
 	                    <span wicket:id="pageTitleReal"></span>
 	                </span>
-                    <img id="ajax_busy" src="img/ajax-loader.gif"/>
+                    <img id="ajax_busy" src="img/ajax-loader.gif" style="margin-top: -8px; margin-left: 5px;" />
 	            </div>
 
                 <!-- Navbar Right Menu -->

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/BreadcrumbPageClass.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/BreadcrumbPageClass.java
@@ -32,23 +32,15 @@ public class BreadcrumbPageClass extends Breadcrumb {
     private Class<? extends WebPage> page;
     private PageParameters parameters;
 
-    public BreadcrumbPageClass(IModel<String> label) {
-        super(label);
-
-        setUseLink(true);
-    }
-
-    public BreadcrumbPageClass(IModel<String> label, Class<? extends WebPage> page) {
-        this(label, page, null);
-    }
-
     public BreadcrumbPageClass(IModel<String> label, Class<? extends WebPage> page, PageParameters parameters) {
         super(label);
 
         Validate.notNull(page, "Page class must not be null");
 
         this.page = page;
         this.parameters = parameters;
+
+        setUseLink(true);
     }
 
     public Class<? extends WebPage> getPage() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
@@ -33,6 +33,7 @@ <h3>
 				<p wicket:id="message" />
 
 				<div class="main-button-bar">
+					<a class="btn btn-primary" wicket:id="home" />
 					<a class="btn btn-primary" wicket:id="back" />
 				</div>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
@@ -26,6 +26,7 @@
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.home.PageDashboard;
 import com.evolveum.midpoint.web.page.self.PageSelfDashboard;
+import com.evolveum.midpoint.web.session.SessionStorage;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.basic.Label;
@@ -49,6 +50,7 @@ public class PageError extends PageBase {
     private static final String ID_LABEL = "label";
     private static final String ID_MESSAGE = "message";
     private static final String ID_BACK = "back";
+    private static final String ID_HOME = "home";
 
     private static final Trace LOGGER = TraceManager.getTrace(PageError.class);
 
@@ -123,15 +125,19 @@ public boolean isVisible() {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
-                        AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
-                    setResponsePage(PageDashboard.class);
-                } else {
-                    setResponsePage(PageSelfDashboard.class);
-                }
+                backPerformed(target);
             }
         };
         add(back);
+
+        AjaxButton home = new AjaxButton(ID_HOME, createStringResource("PageError.button.home")) {
+
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                homePerformed(target);
+            }
+        };
+        add(home);
     }
 
     private int getCode() {
@@ -154,4 +160,17 @@ public boolean isVersioned() {
     public boolean isErrorPage() {
         return true;
     }
+
+    private void homePerformed(AjaxRequestTarget target) {
+        if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
+                AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
+            setResponsePage(PageDashboard.class);
+        } else {
+            setResponsePage(PageSelfDashboard.class);
+        }
+    }
+
+    private void backPerformed(AjaxRequestTarget target) {
+        redirectBack();
+    }
 }
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1562,7 +1562,7 @@ pageDebugView.validateSchema=Validate schema
 PageError403.title=Forbidden (403)
 PageError404.title=Not found (404)
 PageError401.title=Unauthorized (401)
-PageError.button.back=Back to dashboard
+PageError.button.back=Back
 PageError.message=Unexpected error occurred, if necessary please contact system administrator.
 PageError.title=Internal error (500)
 PageFindUsers.title=Find users
@@ -2986,3 +2986,4 @@ operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute.focus.Use
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta=Execute delta (Model)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasts deeply (Task)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw (Task)
+PageError.button.home=Home
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
@@ -1532,7 +1532,7 @@ pageDebugView.validateSchema=Validate schema
 PageError403.title=Forbidden (403)
 PageError404.title=Not found (404)
 PageError401.title=Unauthorized (401)
-PageError.button.back=Back to dashboard
+PageError.button.back=Back
 PageError.message=Unexpected error occurred, if necessary please contact system administrator.
 PageError.title=Internal error (500)
 PageFindUsers.title=Find users