breadcrumb icon, first sample for back on debug view

Evolveum · Mar 1, 2016 · 826c0a0 · 826c0a0
1 parent 63fca42
commit 826c0a0
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 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
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -446,7 +447,7 @@ protected void populateItem(ListItem<Breadcrumb> item) {
 
 					@Override
 					public void onClick(AjaxRequestTarget target) {
-                        dto.redirect(PageBase.this);
+						redirectBackToBreadcrumb(dto);
 					}
 				};
 				item.add(bcLink);
@@ -609,6 +610,12 @@ public SessionStorage getSessionStorage() {
 		return session.getSessionStorage();
 	}
 
+	/**
+	 * use only {@link PageBase#createPageTitleModel()}
+	 * @return
+     */
+	//todo remove [lazyman]
+	@Deprecated
 	protected IModel<String> createPageSubTitleModel() {
 		String key = getClass().getSimpleName() + ".subTitle";
 		return new StringResourceModel(key, this).setDefaultValue("");
@@ -1414,4 +1421,36 @@ public AdminGuiConfigurationType loadAdminGuiConfiguration() {
             return adminGuiConfig;
         }
     }
+
+	public void redirectBack() {
+		List<Breadcrumb> breadcrumbs = getSessionStorage().getBreadcrumbs();
+		if (breadcrumbs.size() < 2) {
+			return;
+		}
+
+		Breadcrumb breadcrumb = breadcrumbs.get(breadcrumbs.size() - 2);
+		redirectBackToBreadcrumb(breadcrumb);
+	}
+
+	public void redirectBackToBreadcrumb(Breadcrumb breadcrumb) {
+		Validate.notNull(breadcrumb, "Breadcrumb must not be null");
+
+		boolean found = false;
+
+		//we remove all breadcrumbs that are after "breadcrumb"
+		List<Breadcrumb> breadcrumbs = getSessionStorage().getBreadcrumbs();
+		Iterator<Breadcrumb> iterator = breadcrumbs.iterator();
+		while (iterator.hasNext()) {
+			Breadcrumb b = iterator.next();
+			if (b.equals(breadcrumb)) {
+				found = true;
+			}
+
+			if (found) {
+				iterator.remove();
+			}
+		}
+
+		breadcrumb.redirect(this);
+	}
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java
@@ -183,6 +183,7 @@ private void menuItemPerformed(MenuItem menu) {
 
         MainMenuItem mainMenuItem = getModelObject();
         Breadcrumb bc = new Breadcrumb(mainMenuItem.getName());
+        bc.setIcon(new Model<>(mainMenuItem.getIconClass()));
         storage.pushBreadcrumb(bc);
 
         setResponsePage(menu.getPage(), menu.getParams());

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -270,16 +270,7 @@ protected void onError(AjaxRequestTarget target, Form<?> form) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                //target.appendJavaScript("history.go(-1)");
-                //todo wtf????
-                Page requestPage = (Page)getSession().getAttribute("requestPage");
-
-                if(requestPage != null){
-                	setResponsePage(requestPage);
-                	getSession().setAttribute("requestPage", null);
-                } else {
-                	setResponsePage(new PageDebugList(false));
-                }
+                redirectBack();
             }
         };
         mainForm.add(backButton);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
@@ -179,6 +179,14 @@ public Breadcrumb popBreadcrumb() {
         return getBreadcrumbs().remove(getBreadcrumbs().size() - 1);
     }
 
+    public Breadcrumb peekBreadcrumb() {
+        if (getBreadcrumbs().isEmpty()) {
+            return null;
+        }
+
+        return getBreadcrumbs().get(getBreadcrumbs().size() - 1);
+    }
+
     public void clearBreadcrumbs() {
         getBreadcrumbs().clear();
     }