MID-6106 fix - Shopping cart selected relation

Evolveum · Mar 12, 2020 · f4a600b · f4a600b
1 parent 72ca80e
commit f4a600b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
 import com.evolveum.midpoint.task.api.Task;
@@ -247,7 +248,11 @@ private void initRelationPanel(WebMarkupContainer parametersPanel){
 
         List<QName> assignableRelationsList = getAvailableRelationsList();
         if (CollectionUtils.isNotEmpty(assignableRelationsList)){
-            getRoleCatalogStorage().setSelectedRelation(assignableRelationsList.get(0));
+            if (assignableRelationsList.contains(SchemaConstants.ORG_DEFAULT)){
+                getRoleCatalogStorage().setSelectedRelation(SchemaConstants.ORG_DEFAULT);
+            } else {
+                getRoleCatalogStorage().setSelectedRelation(assignableRelationsList.get(0));
+            }
         }
         relationContainer.add(new RelationDropDownChoicePanel(ID_RELATION, getRoleCatalogStorage().getSelectedRelation(),
                 assignableRelationsList, false){