summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-05-22 02:36:21 (EDT)
committer Manik Kishore2012-06-19 07:30:25 (EDT)
commit3ea8bf820ebdc2f19fed95fada91ec4379bd2c7d (patch)
tree5f89cd5b56b455b4ab5d9fc514b5f070633b47f7
parentf64389b6996b5edc1351c283f46f89fa95e4e418 (diff)
downloadorg.eclipse.stardust.ui.web-3ea8bf820ebdc2f19fed95fada91ec4379bd2c7d.zip
org.eclipse.stardust.ui.web-3ea8bf820ebdc2f19fed95fada91ec4379bd2c7d.tar.gz
org.eclipse.stardust.ui.web-3ea8bf820ebdc2f19fed95fada91ec4379bd2c7d.tar.bz2
Jira-ID: CRNT-24145
1)Removed sorting by Assiged To column in WorklistTableBean.java and ActivityTableHelper.java 2)Changed sorting from STARTING_USER_OID to USER_ACCOUNT for startingUser in ProcessTableHelper.java git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56476 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/WorklistTableBean.java10
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java7
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java5
3 files changed, 4 insertions, 18 deletions
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/WorklistTableBean.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/WorklistTableBean.java
index 2f1c648..58329c0 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/WorklistTableBean.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/WorklistTableBean.java
@@ -570,7 +570,7 @@ public class WorklistTableBean extends UIComponentBean
FilterCriteria.SELECT_MANY, getAllStatus(), RenderType.LIST, 3, null)), false, false);
ColumnPreference assignedToCol = new ColumnPreference(COL_ASSIGNED_TO,
- "assignedTo", ColumnDataType.STRING, this.getMessages().getString("column.assignedTo"), false, true);
+ "assignedTo", ColumnDataType.STRING, this.getMessages().getString("column.assignedTo"), false, false);
// Fixed Column 2
ColumnPreference colActions = new ColumnPreference(COL_ACTIONS,
@@ -1216,14 +1216,6 @@ public class WorklistTableBean extends UIComponentBean
.ascendig(sortCriterion.isAscending());
query.orderBy(o);
}
- else if ("assignedTo".equals(sortCriterion.getProperty()))
- {
-
- if (!worklistQuery)
- {
- query.orderBy(ActivityInstanceQuery.CURRENT_USER_PERFORMER_OID, sortCriterion.isAscending());
- }
- }
// Is this a descriptor column?
else if (sortCriterion.getProperty().startsWith("descriptorValues."))
{
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
index b144f0a..57639db 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
@@ -438,7 +438,7 @@ public class ActivityTableHelper implements ICallbackHandler , IUserObjectBuilde
ColumnPreference assignedToCol = new ColumnPreference(COL_ASSIGNED_TO,
"currentPerformer", ColumnDataType.STRING, propsBean
.getString("views.activityTable.activityTable.column.assignedTo"),
- true, true);
+ true, false);
assignedToCol.setColumnDataFilterPopup(new TableDataFilterPopup(new ParticipantAutocompleteTableDataFilter()));
ColumnPreference completedByCol = new ColumnPreference(COL_COMPLETED_BY,
@@ -964,11 +964,6 @@ public class ActivityTableHelper implements ICallbackHandler , IUserObjectBuilde
.ascendig(sortCriterion.isAscending());
query.orderBy(o);
}
- else if ("currentPerformer".equals(sortCriterion.getProperty()))
- {
- query.orderBy(ActivityInstanceQuery.CURRENT_USER_PERFORMER_OID,
- sortCriterion.isAscending());
- }
else if ("status".equals(sortCriterion.getProperty()))
{
query.orderBy(ActivityInstanceQuery.STATE,
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java
index d335242..26dba1e 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessTableHelper.java
@@ -992,9 +992,8 @@ public class ProcessTableHelper implements IUserObjectBuilder<ProcessInstanceTab
}
else if ("startingUser".equals(sortCriterion.getProperty()))
{
-
- query.orderBy(ProcessInstanceQuery.STARTING_USER_OID, sortCriterion
- .isAscending());
+ CustomOrderCriterion o = ProcessInstanceQuery.USER_ACCOUNT.ascendig(sortCriterion.isAscending());
+ query.orderBy(o);
}
else