handling the situation when no attorney is selected.

Evolveum · Sep 7, 2022 · 3236366 · 3236366
1 parent eeeceb1
commit 3236366
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAttorney.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsAttorney.java
@@ -39,16 +39,22 @@
         })
 public class PageWorkItemsAttorney extends PageCaseWorkItems {
 
+    public PageWorkItemsAttorney() {
+        this(null);
+    }
+
     public PageWorkItemsAttorney(PageParameters pageParameters) {
         super(pageParameters);
+
+        if (getPowerDonorOid() == null) {
+            getSession().error("PageWorkItemsAttorney.attorney.not.selected");
+            throw redirectBackViaRestartResponseException();
+        }
     }
 
     @Override
     protected ObjectFilter getCaseWorkItemsFilter() {
         String attorneyUserOid = getPowerDonorOid();
-        if (StringUtils.isEmpty(attorneyUserOid) || attorneyUserOid.equals("null")) {
-            return super.getCaseWorkItemsFilter();
-        }
         return getPrismContext().queryFor(CaseWorkItemType.class)
                 .item(CaseWorkItemType.F_ASSIGNEE_REF)
                 .ref(attorneyUserOid, UserType.COMPLEX_TYPE)