Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 3, 2017 · 991bc59 · 991bc59
2 parents 5d9f0e8 + 3bd2f44
commit 991bc59
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 14 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
@@ -1683,13 +1683,20 @@ public DeploymentInformationType loadDeploymentInformationType() {
 
     public boolean canRedirectBack() {
 		List<Breadcrumb> breadcrumbs = getBreadcrumbs();
-		// first is icon (non clickable), last is for "current page" and if there
-		// is nothing in between then we don't know where to redirect
-		if (breadcrumbs.size() < 3) {
-			return false;
+		if (breadcrumbs.size() > 2) {
+			return true;
+		}
+		if (breadcrumbs.size() == 2){
+			BreadcrumbPageClass breadcrumb =  null;
+			if ((breadcrumbs.get(breadcrumbs.size() - 2)) instanceof BreadcrumbPageClass){
+				breadcrumb = (BreadcrumbPageClass) breadcrumbs.get(breadcrumbs.size() - 2);
+			}
+			if (breadcrumb != null && breadcrumb.getPage() != null){
+				return true;
+			}
 		}
 
-		return true;
+		return false;
 	}
 
 	public Breadcrumb redirectBack() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
@@ -31,8 +31,10 @@
 import com.evolveum.midpoint.web.page.admin.roles.PageRole;
 import com.evolveum.midpoint.web.page.admin.services.PageService;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
+import com.evolveum.midpoint.web.page.admin.workflow.PageWorkItem;
 import com.evolveum.midpoint.web.page.self.PageAssignmentDetails;
 import com.evolveum.midpoint.web.session.RoleCatalogStorage;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -42,6 +44,7 @@
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -255,12 +258,16 @@ private void targetObjectDetailsPerformed(final AssignmentEditorDto assignment,
             return;
         }
         if (!plusIconClicked) {
-            String targetObjectOid = assignment.getTargetRef().getOid();
-            OperationResult result = new OperationResult(OPERATION_LOAD_TARGET_OBJECT);
-            Task task = pageBase.createSimpleTask(OPERATION_LOAD_TARGET_OBJECT);
-            PrismObject<AbstractRoleType> targetObject = WebModelServiceUtils.loadObject(AbstractRoleType.class,
-                    targetObjectOid, pageBase, task, result);
-            pageBase.navigateToNext(getTargetObjectDetailsPage(assignment.getType(), targetObject));
+            PageParameters parameters = new PageParameters();
+            parameters.add(OnePageParameterEncoder.PARAMETER, assignment.getTargetRef().getOid());
+
+            if (AssignmentEditorDtoType.ORG_UNIT.equals(assignment.getType())){
+                getPageBase().navigateToNext(PageOrgUnit.class, parameters);
+            } else if (AssignmentEditorDtoType.ROLE.equals(assignment.getType())){
+                getPageBase().navigateToNext(PageRole.class, parameters);
+            } else if (AssignmentEditorDtoType.SERVICE.equals(assignment.getType())){
+                getPageBase().navigateToNext(PageService.class, parameters);
+            }
         } else {
             plusIconClicked = false;
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html
@@ -20,7 +20,7 @@
 	<span class="prism-title" wicket:id="label"/>
 	<div class="box-tools pull-right">
 		<button wicket:id="sortProperties" wicket:message="title:PrismObjectPanel.sortProperties" class="btn btn-box-tool" data-toggle="tooltip"><i class="fa fa-sort-alpha-asc"></i></button>
-		<button wicket:id="showEmptyFields" wicket:message="title:PrismObjectPanel.showEmpty" class="btn btn-box-tool" data-toggle="tooltip" about="showEmptyFields"><i class="fa fa-arrows-alt"></i></button>
+		<button wicket:id="showEmptyFields" wicket:message="title:PrismObjectPanel.showEmpty" class="btn btn-box-tool" data-toggle="tooltip" trigger="hover" about="showEmptyFields"><i class="fa fa-arrows-alt"></i></button>
 	</div>
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java
@@ -68,15 +68,20 @@ public boolean isVisible() {
             public void onClick(AjaxRequestTarget target) {
             	ObjectWrapper objectWrapper = getObjectWrapper(model);
                 objectWrapper.setShowEmpty(!objectWrapper.isShowEmpty());
-                onButtonClick(target);
+//
+//				target.appendJavaScript("document.getElementsByClassName('tooltip').style.visibility = 'hidden';");
+
+				onButtonClick(target);
             }
 
 			@Override
 			public boolean isOn() {
 				return getObjectWrapper(model).isShowEmpty();
 			}
         };
-        showEmptyFieldsButton.add(buttonsVisibleBehaviour);
+		showEmptyFieldsButton.setMarkupId(ID_SHOW_EMPTY_FIELDS);
+
+		showEmptyFieldsButton.add(buttonsVisibleBehaviour);
         add(showEmptyFieldsButton);
 
         ToggleIconButton sortPropertiesButton = new ToggleIconButton(ID_SORT_PROPERTIES,

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
@@ -80,5 +80,9 @@ public void onClick(AjaxRequestTarget target) {
         mainForm.add(addToCart);
     }
 
+    @Override
+    public boolean canRedirectBack(){
+        return true;
+    }
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -427,4 +427,10 @@ private Component getRequestButton(){
     private TextArea getDescriptionComponent(){
         return (TextArea) get(ID_FORM).get(ID_DESCRIPTION);
     }
+
+    @Override
+    public boolean canRedirectBack(){
+        return true;
+    }
+
 }