summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-01-10 04:52:56 (EST)
committerStephan Born2013-01-25 13:20:42 (EST)
commit3875fd97ba37fe7d1770364555556d55041ecf80 (patch)
tree6c2b7c356d0201a8a054b86abe7c02bc760976cf
parentd591f7557365df5de10f6613aa42c8933838a52b (diff)
downloadorg.eclipse.stardust.ui.web-3875fd97ba37fe7d1770364555556d55041ecf80.zip
org.eclipse.stardust.ui.web-3875fd97ba37fe7d1770364555556d55041ecf80.tar.gz
org.eclipse.stardust.ui.web-3875fd97ba37fe7d1770364555556d55041ecf80.tar.bz2
Jira-ID: CRNT-27559
Added validation when Invalid value for Case Owner is provided in ProcessSearchBean.java Added business-control-center-messages_en.properties entry for views.processSearchView.processSearch.invalidCaseOwnerError git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61926 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessSearchBean.java17
-rw-r--r--business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml7
-rw-r--r--business-control-center/src/main/resources/business-control-center-messages_en.properties1
3 files changed, 17 insertions, 8 deletions
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessSearchBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessSearchBean.java
index 9ded162..664618b 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessSearchBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ProcessSearchBean.java
@@ -482,11 +482,6 @@ public class ProcessSearchBean extends UIComponentBean implements ViewEventHandl
"endTimeFrom", "endTimeTo");
}
- if (validationMessageBean.isContainMessages())
- {
- return;
- }
-
// set case attributes
if (getFilterAttributes().isCaseOnlySearch() & ownerSelector.getSelectedValue() != null)
{
@@ -500,11 +495,21 @@ public class ProcessSearchBean extends UIComponentBean implements ViewEventHandl
}
}
}
+ else if (StringUtils.isNotEmpty(ownerSelector.getSearchValue()))
+ {
+ validationMessageBean.addError(this.getMessages().getString("processSearch.invalidCaseOwnerError"),
+ "caseOwnerId");
+ }
else
{
getFilterAttributes().setUser(null);
}
-
+
+ if (validationMessageBean.isContainMessages())
+ {
+ return;
+ }
+
initializeProcessTable();
processSearchProvider.setSelectedProcesses(getSelectedProcessDefs(), descriptorItems, commonDescriptors);
processTableHelper.getProcessTable().refresh(true);
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
index 4109ea8..a4ba722 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
@@ -194,14 +194,17 @@
</ice:panelGroup>
</ice:column>
<ice:column>
- <ice:panelGrid>
- <ice:panelGroup style="width:159px;vertical-align:top;margin-top:-3px;">
+ <ice:panelGrid columns="2">
+ <ice:panelGroup id="caseOwnerId" style="width:159px;vertical-align:top;margin-top:-3px;">
<ui:include
src="#{processSearchBean.ownerSelector.autocompleteContentUrl}">
<ui:param name="component"
value="#{processSearchBean.ownerSelector}" />
</ui:include>
</ice:panelGroup>
+ <ice:message styleClass="iceMsgImage"
+ id="caseOwnerIdError" for="caseOwnerId" showDetail="false"
+ showSummary="false" />
</ice:panelGrid>
</ice:column>
diff --git a/business-control-center/src/main/resources/business-control-center-messages_en.properties b/business-control-center/src/main/resources/business-control-center-messages_en.properties
index 3e9aca0..3f8fc09 100644
--- a/business-control-center/src/main/resources/business-control-center-messages_en.properties
+++ b/business-control-center/src/main/resources/business-control-center-messages_en.properties
@@ -239,6 +239,7 @@ views.processSearchView.tooltip.viewGanttChart=View Gantt Chart
views.processSearchView.startedDateRangeError=Enter a valid 'Started' range
views.processSearchView.DateRangeError=Enter a valid date range
views.processSearchView.processSearch.endDateRangeError=Enter a valid 'End Time' range
+views.processSearchView.processSearch.invalidCaseOwnerError=Enter a valid Case Owner
views.processSearchView.activitySearch.modifyDateRangeError=Enter a valid 'Modify Time' range
views.processSearchView.activitySearch.invalidPerformerError=Enter a valid Performer
views.processSearchView.hideAuxiliaryActivity.label=Hide Auxiliary Activities