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

Conflicts:
	infra/schema/src/main/resources/localization/schema.properties

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java

@@ -16,6 +16,7 @@
 package com.evolveum.midpoint.gui.api.util;
 
 import static com.evolveum.midpoint.gui.api.page.PageBase.createStringResourceStatic;
+import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.normalizeRelation;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -907,24 +908,27 @@ public static String getName(PrismObject object) {
 
 	public static <C extends Containerable> String getDisplayName(PrismContainerValue<C> prismContainerValue) {
 		if (prismContainerValue == null || prismContainerValue.isEmpty()) {
-			return "prismContainerValue.new";
+			return "ContainerPanel.containerProperties";
 		}
-		
+
 		C containerable = prismContainerValue.asContainerable();
-
 		if (containerable instanceof AssignmentType && ((AssignmentType) containerable).getTargetRef() != null) {
 			ObjectReferenceType assignemntTargetRef = ((AssignmentType) containerable).getTargetRef();
-			return getName(assignemntTargetRef) + " - " + assignemntTargetRef.getRelation();
-		} 
-		
+			return getName(assignemntTargetRef) + " - " + normalizeRelation(assignemntTargetRef.getRelation()).getLocalPart();
+		}
+
 		if (containerable instanceof ExclusionPolicyConstraintType){
-			ExclusionPolicyConstraintType exclusionContraint = (ExclusionPolicyConstraintType) containerable;
-			String displayName = exclusionContraint.getName() + "-" + getName(exclusionContraint.getTargetRef());
+			ExclusionPolicyConstraintType exclusionConstraint = (ExclusionPolicyConstraintType) containerable;
+			String displayName = (exclusionConstraint.getName() != null ? exclusionConstraint.getName() + "-" : "")
+					+ StringUtils.defaultIfEmpty(getName(exclusionConstraint.getTargetRef()), "");
 			return StringUtils.isNotEmpty(displayName) ? displayName : "Not defined exclusion name";
 		}
-
-		return "Impelement in WebComponentUtil.getName(PrismContainerValue<C> prismContainerValue";
-
+		if (containerable instanceof AbstractPolicyConstraintType){
+			AbstractPolicyConstraintType constraint = (AbstractPolicyConstraintType) containerable;
+			String displayName = constraint.getName() + "-" + constraint.getDescription();
+			return StringUtils.isNotEmpty(displayName) ? displayName : "ContainerPanel.containerProperties";
+		}
+		return "ContainerPanel.containerProperties";
 	}
 
 	public static String getDisplayNameOrName(PrismObject object) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java

@@ -147,10 +147,13 @@ private boolean getAssignmentBasicTabVisibity(ItemWrapper itemWrapper, ItemPath
 		}
 		pathsToHide.add(parentAssignmentPath.append(AssignmentType.F_TARGET_REF));
 
-		if (OrgType.COMPLEX_TYPE.equals(targetType)) {
+		if (OrgType.COMPLEX_TYPE.equals(targetType) || AssignmentsUtil.isPolicyRuleAssignment(getModelObject().getContainerValue().asContainerable())) {
 			pathsToHide.add(parentAssignmentPath.append(AssignmentType.F_TENANT_REF));
 			pathsToHide.add(parentAssignmentPath.append(AssignmentType.F_ORG_REF));
 		}
+		if (AssignmentsUtil.isPolicyRuleAssignment(getModelObject().getContainerValue().asContainerable())){
+			pathsToHide.add(parentAssignmentPath.append(AssignmentType.F_FOCUS_TYPE));
+		}
 
 		if (assignment.getConstruction() == null) {
 			pathsToHide.add(parentAssignmentPath.append(AssignmentType.F_CONSTRUCTION));

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java

@@ -43,8 +43,6 @@ protected List<ItemPath> collectContainersToShow() {
 		List<ItemPath> containersToShow = new ArrayList<>();
 		containersToShow.add(getAssignmentPath().append(AssignmentType.F_POLICY_RULE));
 
-		containersToShow.add(getAssignmentPath().append(AssignmentType.F_POLICY_EXCEPTION));
-
 		return containersToShow;
 	}