Minor fixes related to links in deltas.

Evolveum · Mar 22, 2016 · d9c29c1 · d9c29c1
1 parent e3d2a5a
commit d9c29c1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -51,6 +51,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
 import com.evolveum.midpoint.web.page.admin.resources.PageResource;
 import com.evolveum.midpoint.web.page.admin.roles.PageRole;
+import com.evolveum.midpoint.web.page.admin.server.PageTaskEdit;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
 import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.midpoint.web.security.MidPointApplication;
@@ -997,10 +998,25 @@ public static void dispatchToObjectDetailsPage(ObjectReferenceType objectRef, Pa
 			page.setResponsePage(new PageUser(parameters, page));
 		} else if (ResourceType.COMPLEX_TYPE.equals(type)) {
 			page.setResponsePage(new PageResource(parameters, page));
+		} else if (TaskType.COMPLEX_TYPE.equals(type)) {
+			page.setResponsePage(new PageTaskEdit(parameters, page));
 		} else {
 			// nothing to do
 		}
 	}
 
+	public static boolean hasDetailsPage(PrismObject<?> object) {
+		Class<?> clazz = object.getCompileTimeClass();
+		if (clazz == null) {
+			return false;
+		}
+
+		return AbstractRoleType.class.isAssignableFrom(clazz) ||
+				UserType.class.isAssignableFrom(clazz) ||
+				ResourceType.class.isAssignableFrom(clazz) ||
+				TaskType.class.isAssignableFrom(clazz);
+	}
+
+
 
 }
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
@@ -117,6 +117,11 @@ public SceneDto getObject() {
 		initLayout();
 	}
 
+	@Override
+	protected void createBreadcrumb() {
+		createInstanceBreadcrumb();
+	}
+
 	private void initLayout() {
 		Form mainForm = new Form("mainForm");
 		mainForm.setMultiPart(true);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
@@ -162,7 +162,7 @@ public boolean isVisible() {
 				if (getModelObject().isWrapper()) {
 					return false;
 				}
-				return isExistingObject();
+				return isExistingViewableObject();
 			}
 		};
 		VisibleEnableBehaviour visibleIfNotWrapperAndNotExistingObject = new VisibleEnableBehaviour() {
@@ -171,7 +171,7 @@ public boolean isVisible() {
 				if (getModelObject().isWrapper()) {
 					return false;
 				}
-				return !isExistingObject();
+				return !isExistingViewableObject();
 			}
 		};
 		headerChangeType.add(visibleIfNotWrapper);
@@ -247,11 +247,12 @@ protected void populateItem(ListItem<SceneDto> item) {
         body.add(partialScenes);
     }
 
-	protected boolean isExistingObject() {
+	protected boolean isExistingViewableObject() {
 		final Scene scene = getModelObject().getScene();
 		final PrismContainerValue<?> value = scene.getSourceValue();
 		return value != null &&
 				value.getParent() instanceof PrismObject &&
+				WebComponentUtil.hasDetailsPage((PrismObject) value.getParent()) &&
 				((PrismObject) value.getParent()).getOid() != null &&
 				(scene.getSourceDelta() == null || !scene.getSourceDelta().isAdd());
 	}