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

Evolveum · Jun 13, 2017 · 5488e64 · 5488e64
2 parents 1a2c5a0 + 33e4887
commit 5488e64
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
@@ -280,24 +280,29 @@ public void onClick(AjaxRequestTarget target) {
 					});
 			items.add(item);
 		}
-		item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.showAllAssignments"),
-				new InlineMenuItemAction() {
-					private static final long serialVersionUID = 1L;
-
-					@Override
-					public void onClick(AjaxRequestTarget target) {
-						showAllAssignments(target);
-					}
-				});
-		items.add(item);
+		if (isShowAllAssignmentsVisible()) {
+			item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.showAllAssignments"),
+					new InlineMenuItemAction() {
+						private static final long serialVersionUID = 1L;
 
+						@Override
+						public void onClick(AjaxRequestTarget target) {
+							showAllAssignments(target);
+						}
+					});
+			items.add(item);
+		}
 		return items;
 	}
 
 	protected void showAllAssignments(AjaxRequestTarget target) {
 
 	}
 
+	protected boolean isShowAllAssignmentsVisible(){
+		return false;
+	}
+
 	private List<AssignmentEditorDto> getSelectedAssignments() {
 		List<AssignmentEditorDto> selected = new ArrayList<>();
 

diff --git a/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java b/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
@@ -17,6 +17,8 @@
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.prism.PrismContainer;
+import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDto;
@@ -68,6 +70,13 @@ protected boolean getAssignmentMenuVisibility() {
                 return  !getObjectWrapper().isReadonly();
             }
 
+            @Override
+			protected boolean isShowAllAssignmentsVisible(){
+				PrismContainer assignmentContainer = getObjectWrapper().getObject().findContainer(new ItemPath(FocusType.F_ASSIGNMENT));
+				return assignmentContainer != null && assignmentContainer.getDefinition() != null ?
+						assignmentContainer.getDefinition().canRead() : super.isShowAllAssignmentsVisible();
+			}
+
             @Override
 			protected void showAllAssignments(AjaxRequestTarget target) {
                 List<AssignmentsPreviewDto> assignmentsPreviewDtos = ((PageAdminFocus) getPageBase()).recomputeAssignmentsPerformed(target);