delegated to me panel fix

Evolveum · Sep 14, 2021 · aa3bab6 · aa3bab6
1 parent 33fbcfb
commit aa3bab6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/DelegatedToMePanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/DelegatedToMePanel.java
@@ -129,7 +129,7 @@ public boolean isVisible(){
 
     public void populateAssignmentDetailsPanel(ListItem<AssignmentEditorDto> item) {
         com.evolveum.midpoint.web.component.assignment.DelegationEditorPanel editor = new DelegationEditorPanel(ID_ROW, item.getModel(), true,
-                getObjectDetailsModels().getPrivilegesListModel(), getPageBase());
+                getObjectDetailsModels().getPrivilegesListModel());
         item.add(editor);
     }
 

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserDelegationsPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserDelegationsPanel.java
@@ -71,7 +71,7 @@ protected void initLayout() {
             @Override
             public void populateAssignmentDetailsPanel(ListItem<AssignmentEditorDto> item) {
                 DelegationEditorPanel editor = new DelegationEditorPanel(ID_ROW, item.getModel(), false,
-                        getObjectDetailsModels().getPrivilegesListModel(), getPageBase());
+                        getObjectDetailsModels().getPrivilegesListModel());
                 item.add(editor);
             }
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
@@ -13,15 +13,14 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
+import com.evolveum.midpoint.gui.impl.page.admin.user.PageUser;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.DateInput;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.midpoint.web.page.admin.users.component.AssignmentInfoDto;
 import com.evolveum.midpoint.web.page.admin.users.component.DelegationTargetLimitationDialog;
-import com.evolveum.midpoint.web.page.admin.users.component.ExecuteChangeOptionsPanel;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OtherPrivilegesLimitationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
@@ -84,7 +83,7 @@ public class DelegationEditorPanel extends AssignmentEditorPanel {
     private List<UserType> usersToUpdate;
 
     public DelegationEditorPanel(String id, IModel<AssignmentEditorDto> delegationTargetObjectModel, boolean delegatedToMe,
-                                 List<AssignmentInfoDto> privilegesList, PageBase pageBase) {
+                                 List<AssignmentInfoDto> privilegesList) {
         super(id, delegationTargetObjectModel, delegatedToMe, new LoadableModel<List<AssignmentInfoDto>>(false) {
             @Override
             protected List<AssignmentInfoDto> load() {
@@ -94,7 +93,7 @@ protected List<AssignmentInfoDto> load() {
     }
 
     public DelegationEditorPanel(String id, IModel<AssignmentEditorDto> delegationTargetObjectModel, boolean delegatedToMe,
-                                 LoadableModel<List<AssignmentInfoDto>> privilegesListModel, PageBase pageBase) {
+                                 LoadableModel<List<AssignmentInfoDto>> privilegesListModel) {
             super(id, delegationTargetObjectModel, delegatedToMe, privilegesListModel);
         }
 
@@ -160,7 +159,7 @@ public void onClick(AjaxRequestTarget target) {
         WebMarkupContainer delegatedToTypeImage = new WebMarkupContainer(ID_DELEGATED_TO_IMAGE);
         if (delegatedToMe){
             delegatedToTypeImage.add(AttributeModifier.append("class",
-                    WebComponentUtil.createDefaultIcon(((PageUser)pageBase).getObjectWrapper().getObject())));
+                    WebComponentUtil.createDefaultIcon(((PageUser)pageBase).getObjectDetailsModels().getObjectWrapperModel().getObject().getObject())));
         } else {
             if (getModelObject().getDelegationOwner() != null) {
                 delegatedToTypeImage.add(AttributeModifier.append("class",

diff --git a/.../main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java b/.../main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java
@@ -82,7 +82,7 @@ private void initLayout() {
             @Override
             public void populateAssignmentDetailsPanel(ListItem<AssignmentEditorDto> item) {
                 DelegationEditorPanel editor = new DelegationEditorPanel(ID_ROW, item.getModel(), false,
-                        privilegesListModel, getPageBase());
+                        privilegesListModel);
                 item.add(editor);
             }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -264,7 +264,7 @@ public WebMarkupContainer createPanel(String panelId) {
                     @Override
                     public void populateAssignmentDetailsPanel(ListItem<AssignmentEditorDto> item) {
                         DelegationEditorPanel editor = new DelegationEditorPanel(ID_ROW, item.getModel(), true,
-                                privilegesListModel, PageUser.this);
+                                privilegesListModel);
                         item.add(editor);
                     }