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

Evolveum · Apr 13, 2023 · 453c559 · 453c559
2 parents d537ea6 + 1ecbe09
commit 453c559
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/...om/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java b/...om/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java
@@ -225,7 +225,7 @@ public boolean isParameterSearchVisible() {
     }
 
     public List<QName> getSupportedRelations() {
-        return relationSearchItemWrapper.getRelationsForSearch();
+        return relationSearchItemWrapper.getSupportedRelations();
     }
 
     public QName getRelationValue() {

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -458,6 +458,9 @@ protected List<AssignmentObjectRelation> getDefaultNewMemberRelations() {
                     supportedRelation.remove(RelationTypes.OWNER.getRelation());
                     supportedRelation.remove(RelationTypes.MANAGER.getRelation());
                 }
+                if (supportedRelation.isEmpty()) {
+                    return;
+                }
                 AssignmentObjectRelation assignmentObjectRelation = new AssignmentObjectRelation();
                 assignmentObjectRelation.addRelations(supportedRelation);
                 assignmentObjectRelation.addObjectTypes(Collections.singletonList(objectType));

diff --git a/repo/system-init/src/main/resources/initial-objects/archetype/701-archetype-object-mark.xml b/repo/system-init/src/main/resources/initial-objects/archetype/701-archetype-object-mark.xml
@@ -31,6 +31,7 @@
                     <display>
                         <label>Marked shadows</label>
                     </display>
+                    <applicableForOperation>modify</applicableForOperation>
                     <panelType>markedShadowList</panelType>
                 </panel>
                 <panel>