Fixed target and object names in work item lists.

Evolveum · Apr 24, 2017 · 4e216dd · 4e216dd
1 parent ae3b60b
commit 4e216dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java b/.../src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
@@ -40,8 +40,8 @@
 import java.util.*;
 
 import static com.evolveum.midpoint.gui.api.util.WebComponentUtil.*;
+import static com.evolveum.midpoint.prism.PrismConstants.T_PARENT;
 import static com.evolveum.midpoint.prism.query.OrderDirection.DESCENDING;
-import static com.evolveum.midpoint.schema.GetOperationOptions.createResolve;
 import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType.*;
 
 /**
@@ -82,8 +82,10 @@ public Iterator<? extends WorkItemDto> internalIterator(long first, long count)
         try {
             ObjectQuery query = createQuery(first, count, result);
             Collection<SelectorOptions<GetOperationOptions>> options =
-                    Collections.singletonList(
-                            SelectorOptions.create(new ItemPath(F_ASSIGNEE_REF), createResolve()));
+                    GetOperationOptions.resolveItemsNamed(
+                            new ItemPath(F_ASSIGNEE_REF),
+                            new ItemPath(T_PARENT, WfContextType.F_OBJECT_REF),
+                            new ItemPath(T_PARENT, WfContextType.F_TARGET_REF));
             List<WorkItemType> items = getModel().searchContainers(WorkItemType.class, query, options, task, result);
 
             for (WorkItemType item : items) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -15,11 +15,13 @@
  */
 package com.evolveum.midpoint.web.page.self;
 
+import static com.evolveum.midpoint.prism.PrismConstants.T_PARENT;
 import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType.F_CREATE_TIMESTAMP;
 
 import java.util.*;
 
 import com.evolveum.midpoint.gui.api.PredefinedDashboardWidgetId;
+import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.schema.util.AdminGuiConfigTypeUtil;
 import com.evolveum.midpoint.web.application.Url;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -282,7 +284,11 @@ private CallableResult<List<WorkItemDto>> loadWorkItems() {
                     .item(WorkItemType.F_ASSIGNEE_REF).ref(user.getOid())
                     .desc(F_CREATE_TIMESTAMP)
                     .build();
-            List<WorkItemType> workItems = getModelService().searchContainers(WorkItemType.class, query, null, task, result);
+            Collection<SelectorOptions<GetOperationOptions>> options =
+                    GetOperationOptions.resolveItemsNamed(
+                            new ItemPath(T_PARENT, WfContextType.F_OBJECT_REF),
+                            new ItemPath(T_PARENT, WfContextType.F_TARGET_REF));
+            List<WorkItemType> workItems = getModelService().searchContainers(WorkItemType.class, query, options, task, result);
             for (WorkItemType workItem : workItems) {
                 list.add(new WorkItemDto(workItem));
             }

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
@@ -78,8 +78,8 @@ public static <T> Collection<SelectorOptions<T>> createCollection(QName pathQNam
 	}
 
 	public static <T> Collection<SelectorOptions<T>> createCollection(T options) {
-		Collection<SelectorOptions<T>> optionsCollection = new ArrayList<SelectorOptions<T>>(1);
-		optionsCollection.add(new SelectorOptions<T>(options));
+		Collection<SelectorOptions<T>> optionsCollection = new ArrayList<>(1);
+		optionsCollection.add(new SelectorOptions<>(options));
 		return optionsCollection;
 	}