fixed bug 26238: empty Property field selector on Defined Selector Field tab
authorAsier Lostalé <asier.lostale@openbravo.com>
Thu, 10 Apr 2014 14:21:17 +0200
changeset 22901 d1c9b351823b
parent 22900 2df9efa7fba0
child 22902 876978a97cfe
fixed bug 26238: empty Property field selector on Defined Selector Field tab
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java	Fri Mar 21 18:20:16 2014 +0530
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java	Thu Apr 10 14:21:17 2014 +0200
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2010-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -67,7 +67,7 @@
 
     final Entity baseEntity = getBaseEntity(parameters);
     String propertyPath = parameters.get(PROPERTY_FIELD);
-    if (propertyPath == null) {
+    if ("null".equals(propertyPath) || propertyPath == null) {
       HashMap<String, String> criteria = getCriteria(parameters);
       if (criteria != null && criteria.containsKey(DATASOURCE_FIELD)) {
         propertyPath = criteria.get(DATASOURCE_FIELD);