details: /erp/devel/pi/rev/4ee6a3acc8ba
changeset: 10768:4ee6a3acc8ba
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Feb 18 10:49:39 2011 +0100
summary: [OBUISEL] Always apply default expression on picklist with AND
clauses.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (21 lines):
diff -r 3a938573e0b7 -r 4ee6a3acc8ba
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Fri Feb 18 10:47:16 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
Fri Feb 18 10:49:39 2011 +0100
@@ -154,10 +154,14 @@
boolean hasFilter = false;
for (SelectorField field : sel.getOBUISELSelectorFieldList()) {
String value = parameters.get(field.getDisplayColumnAlias());
- if (!parameters.containsKey(field.getDisplayColumnAlias())
- && field.getDefaultExpression() != null &&
!"Window".equals(requestType)) {
+ if (field.getDefaultExpression() != null &&
!"Window".equals(requestType)) {
try {
- value = (String) evaluateExpression(field.getDefaultExpression(),
parameters);
+ String defaultValue =
evaluateExpression(field.getDefaultExpression(), parameters)
+ .toString();
+ if (StringUtils.isNotEmpty(defaultValue)) {
+ additionalFilter.append(NEW_FILTER_CLAUSE);
+ additionalFilter.append(getWhereClause(defaultValue, field,
xmlDateFormat));
+ }
} catch (Exception e) {
log.error("Error evaluating filter expression: " + e.getMessage(),
e);
}
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
