MID-5991 OrgTree approver/owner relation fix

Evolveum · Jan 22, 2020 · 538fc89 · 538fc89
1 parent cc8fd64
commit 538fc89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -736,7 +736,7 @@ private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 
     public void refreshTable(Class<O> newTypeClass, AjaxRequestTarget target) {
         BoxedTablePanel<SelectableBean<O>> table = getTable();
-        if (!getType().equals(newTypeClass)) {
+        if (isTypeChanged(newTypeClass)) {
             ObjectTypes newType = newTypeClass != null ? ObjectTypes.getObjectType(newTypeClass) : null;
 
             BaseSortableDataProvider<SelectableBean<O>> provider = getDataProvider();
@@ -760,6 +760,10 @@ public void refreshTable(Class<O> newTypeClass, AjaxRequestTarget target) {
 
     }
 
+    protected boolean isTypeChanged(Class<O> newTypeClass){
+        return !getType().equals(newTypeClass);
+    }
+
     public void resetSearchModel(){
         String storageKey = getStorageKey();
         if (StringUtils.isNotEmpty(storageKey)) {

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
@@ -299,6 +299,10 @@ protected GuiObjectListPanelConfigurationType getAdditionalPanelConfig(){
             protected boolean isAdditionalPanel(){
                 return true;
             }
+
+            protected boolean isTypeChanged(Class<ObjectType> newTypeClass){
+                return true;
+            }
         };
         childrenListPanel.setOutputMarkupId(true);
         memberContainer.add(childrenListPanel);

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -118,11 +118,6 @@ protected QName getObjectTypesListParentType(){
         return AssignmentHolderType.COMPLEX_TYPE;
     }
 
-    @Override
-    protected List<ObjectReferenceType> getMembershipReferenceList(FocusType focusObject){
-        return focusObject.getParentOrgRef();
-    }
-
     @Override
     protected <O extends ObjectType> Class<O> getDefaultObjectType() {
         return getMemberPanelStorage().getType() != null ? (Class) WebComponentUtil.qnameToClass(getPageBase().getPrismContext(),