create new member button fix

Evolveum · Sep 29, 2021 · 0faa4a2 · 0faa4a2
1 parent a43da64
commit 0faa4a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -9,12 +9,10 @@
 import java.util.*;
 
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.util.ObjectCollectionViewUtil;
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
 import com.evolveum.midpoint.model.common.util.DefaultColumnUtils;
 
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ChangeType;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -204,7 +202,7 @@ public void onClick(AjaxRequestTarget target) {
                     }
                 }
 
-                if (getNewObjectInfluencesList().size() <= 1) {
+                if (!showNewObjectCreationPopup()) {
                     newObjectPerformed(target, null, getObjectCollectionView());
                     return;
                 }
@@ -228,6 +226,10 @@ protected void buttonClickPerformed(AjaxRequestTarget target, AssignmentObjectRe
         return createNewObjectButton;
     }
 
+    protected boolean showNewObjectCreationPopup() {
+        return getNewObjectInfluencesList() != null && getNewObjectInfluencesList().size() > 1;
+    }
+
     protected boolean isViewForObjectCollectionType(CompiledObjectCollectionView collectionView, String oid, QName type) {
         if (collectionView == null) {
             return false;

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -253,6 +253,11 @@ && getSearchModel().getObject().isTypeChanged()) {
                 super.refreshTable(target);
             }
 
+            @Override
+            protected boolean showNewObjectCreationPopup() {
+                return CollectionUtils.isNotEmpty(getNewObjectReferencesList(getObjectCollectionView(), null));
+            }
+
             @Override
             protected List<ObjectReferenceType> getNewObjectReferencesList(CompiledObjectCollectionView collectionView, AssignmentObjectRelation relation) {
                 List<ObjectReferenceType> refList = super.getNewObjectReferencesList(collectionView, relation);

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
@@ -179,6 +179,11 @@ protected boolean isObjectDetailsEnabled(IModel<SelectableBean<AH>> rowModel) {
                 return WebComponentUtil.hasDetailsPage(objectClass);
             }
 
+            @Override
+            protected boolean showNewObjectCreationPopup() {
+                return CollectionUtils.isNotEmpty(getNewObjectReferencesList(getObjectCollectionView(), null));
+            }
+
             @Override
             protected List<Component> createToolbarButtonsList(String buttonId) {
                 List<Component> buttonsList = super.createToolbarButtonsList(buttonId);