Changed order of columns for work items and approval requests.

Evolveum · Apr 28, 2016 · 1c7ec43 · 1c7ec43
1 parent e94f19c
commit 1c7ec43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
@@ -85,11 +85,11 @@ private void initLayout(UserProfileStorage.TableId tableId, int pageSize, View v
 			if (view == FULL_LIST) {
 				columns.add(new CheckBoxHeaderColumn<WorkItemDto>());
 			}
+			columns.add(createNameColumn());
 			columns.add(createTypeIconColumn(true));
 			columns.add(createObjectNameColumn("WorkItemsPanel.object"));
 			columns.add(createTypeIconColumn(false));
 			columns.add(createTargetNameColumn("WorkItemsPanel.target"));
-			columns.add(createNameColumn());
 			if (view == FULL_LIST) {
 				columns.add(new AbstractColumn<WorkItemDto, String>(createStringResource("WorkItemsPanel.started")) {
 					@Override
@@ -120,8 +120,8 @@ public Date getObject() {
 				columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.actors"), WorkItemDto.F_ASSIGNEE_OR_CANDIDATES));
 			}
 		} else {
-			columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.actors"), WorkItemDto.F_ASSIGNEE_OR_CANDIDATES));
 			columns.add(createNameColumn());
+			columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.actors"), WorkItemDto.F_ASSIGNEE_OR_CANDIDATES));
             columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.created"), WorkItemDto.F_CREATED_FORMATTED));
 		}
 

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java
@@ -101,11 +101,11 @@ private List<IColumn<ProcessInstanceDto, String>> initColumns(View view) {
 			if (view == FULL_LIST) {
 				columns.add(new CheckBoxHeaderColumn<ProcessInstanceDto>());
 			}
+			columns.add(createNameColumn());
 			columns.add(createTypeIconColumn(true));
 			columns.add(createObjectNameColumn("pageProcessInstances.item.object"));
 			columns.add(createTypeIconColumn(false));
 			columns.add(createTargetNameColumn("pageProcessInstances.item.target"));
-			columns.add(createNameColumn());
 			columns.add(createStateColumn());
 			columns.add(new PropertyColumn<ProcessInstanceDto, String>(createStringResource("pageProcessInstances.item.started"), F_START_FORMATTED));
 			columns.add(createOutcomeColumn());