Merge branch 'master' into feature/better-inttest

# Conflicts: # model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java # model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java # model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Evolveum · Feb 29, 2020 · 71030c4 · 71030c4
2 parents 1b9e4eb + 90079a3
commit 71030c4
Show file tree

Hide file tree

Showing 33 changed files with 10,701 additions and 10,125 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
@@ -1225,8 +1225,8 @@ public static <C extends Containerable> String getDisplayName(PrismContainerValu
             if (name != null && !name.isEmpty()) {
                 displayName = name;
             }
-        } else if (prismContainerValue.canRepresent(PropertyConstraintType.class)) {
-            PropertyConstraintType propertyConstraintType = (PropertyConstraintType) prismContainerValue.asContainerable();
+        } else if (prismContainerValue.canRepresent(ItemConstraintType.class)) {
+            ItemConstraintType propertyConstraintType = (ItemConstraintType) prismContainerValue.asContainerable();
             String path = "";
             if (propertyConstraintType.getPath() != null) {
                 path = propertyConstraintType.getPath().getItemPath().toString();