details:   /erp/devel/pi/rev/91400238c0ff
changeset: 10805:91400238c0ff
user:      Stefan Hühner <stefan.huehner <at> openbravo.com>
date:      Fri Feb 18 19:01:04 2011 +0100
summary:   Fix default filter of business partner selector.
This change restore behavior of filtering by default for customers in sales
window and vendors in purchase windows when using the business partner selector
- SelectorDataSourceFilter: skip processing when selector has custom query
- OBBindings: accept both 'Y' and 'true' as values of issotrx check

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
                       |  6 ++++--
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
 |  6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r eb96c8dd63e2 -r 91400238c0ff 
modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
     Fri Feb 18 18:09:27 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
     Fri Feb 18 19:01:04 2011 +0100
@@ -102,11 +102,13 @@
       return null;
     }
 
-    if (requestMap.get(OBBindingsConstants.SO_TRX_PARAM) == null) {
+    String value = requestMap.get(OBBindingsConstants.SO_TRX_PARAM);
+
+    if (value == null) {
       return null;
     }
 
-    return 
"Y".equalsIgnoreCase(requestMap.get(OBBindingsConstants.SO_TRX_PARAM));
+    return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
   }
 
   public String getWindowId() {
diff -r eb96c8dd63e2 -r 91400238c0ff 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
--- 
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
       Fri Feb 18 18:09:27 2011 +0100
+++ 
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
       Fri Feb 18 19:01:04 2011 +0100
@@ -174,6 +174,12 @@
     Entity entity = 
ModelProvider.getInstance().getEntityByTableId(sel.getTable().getId());
 
     for (SelectorField sf : sfc.list()) {
+      // skip selector fields which do not have a property defined (needed for 
selector definitions
+      // using a custom query
+      if (sf.getProperty() == null) {
+        continue;
+      }
+
       // Skip values from the request
       if (parameters.get(sf.getProperty()) != null) {
         log.debug("Skipping the default value evaluation for property: " + 
sf.getProperty()

------------------------------------------------------------------------------
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

Reply via email to