Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Oct 10, 2022 · bac2a65 · bac2a65
2 parents d348de2 + eb8f8bd
commit bac2a65
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/config/initial-objects/042-role-reviewer.xml b/config/initial-objects/042-role-reviewer.xml
@@ -69,7 +69,7 @@
         </description>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
         <object>
-            <type>RoleType</type>
+            <type>OrgType</type>
         </object>
         <item>name</item>
         <item>displayName</item>

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
@@ -228,11 +228,14 @@ public void removeAssignments(List<AssignmentType> assignments) {
         for (AssignmentType a : assignments) {
             this.selectedAssignments.remove(a);
 
-            for (List<AssignmentType> list : requestItems.values()) {
-                list.remove(a);
+            for (ObjectReferenceType ref : requestItems.keySet()) {
+                List<AssignmentType> assignmentList = requestItems.get(ref);
+                assignmentList.remove(a);
+                if (CollectionUtils.isEmpty(assignmentList)) {
+                    requestItems.remove(ref);
+                }
             }
         }
-
         markConflictsDirty();
     }
 

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
@@ -203,7 +203,11 @@ public boolean isEnabled(IModel<PrismContainerValueWrapper<CaseWorkItemType>> ro
 
             @Override
             public void onClick(IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel) {
-                PageParameters params = getPageBase().getPageParameters();
+                PageParameters params = new PageParameters();
+                // we have to copy params, not use current directly otherwise we'll end up with one PageParameters object in multiple breadcrumbs
+                PageParameters current = getPageBase().getPageParameters();
+                params.mergeWith(current);
+
                 PrismContainerValueWrapper<CaseWorkItemType> rowObject = rowModel.getObject();
                 if (rowObject != null) {
                     CaseWorkItemType workItem = rowObject.getRealValue();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.html
@@ -12,7 +12,7 @@
     <div wicket:id="summaryPanel" class="row" />
     <div wicket:id="workItemDetails" />
     <div class="main-button-bar">
-        <a class="btn btn-default pull-left" style="margin-right: 5px;"  wicket:id="backButton"/>
+        <a class="btn btn-default pull-left mr-3" wicket:id="backButton"/>
         <div wicket:id="caseWorkItemActionsPanel" />
     </div>
 </wicket:extend>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
@@ -9,18 +9,18 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import com.evolveum.midpoint.prism.query.ObjectFilter;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
-import com.evolveum.midpoint.web.page.admin.workflow.PageAdminWorkItems;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
+import com.evolveum.midpoint.prism.query.ObjectFilter;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
+import com.evolveum.midpoint.web.page.admin.workflow.PageAdminWorkItems;
 
 /**
  * @author bpowers
@@ -29,7 +29,6 @@
         urls = {
                 @Url(mountUrl = "/admin/workItems")
         },
-        encoder = PageParametersEncoder.class,
         action = {
                 @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_APPROVALS_ALL_URL,
                         label = PageAdminWorkItems.AUTH_APPROVALS_ALL_LABEL,
@@ -39,6 +38,7 @@
                         description = "PageWorkItems.auth.WorkItems.description")
         })
 public class PageCaseWorkItems extends PageAdminCaseWorkItems {
+
     private static final long serialVersionUID = 1L;
 
     private static final Trace LOGGER = TraceManager.getTrace(PageCaseWorkItems.class);
@@ -48,7 +48,6 @@ public class PageCaseWorkItems extends PageAdminCaseWorkItems {
     private static final String PARAMETER_CASE_WORK_ITEM_ID = "caseWorkItemId";
 
     private static final String ID_CASE_WORK_ITEMS_TABLE = "caseWorkItemsTable";
-    private PageParameters pageParameters = null;
 
     public PageCaseWorkItems() {
         super(null);
@@ -66,6 +65,7 @@ protected void onInitialize(){
 
     private void initLayout() {
         CaseWorkItemsPanel workItemsPanel = new CaseWorkItemsPanel(ID_CASE_WORK_ITEMS_TABLE, null) {
+
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -99,5 +99,4 @@ protected List<InlineMenuItem> createRowActions(){
     protected CaseWorkItemsPanel getCaseWorkItemsTable() {
         return (CaseWorkItemsPanel) get(createComponentPath(ID_CASE_WORK_ITEMS_TABLE));
     }
-
 }
diff --git a/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml b/gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
@@ -69,7 +69,7 @@
         </description>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
         <object>
-            <type>RoleType</type>
+            <type>OrgType</type>
         </object>
         <item>name</item>
         <item>displayName</item>