Fixes issue 18747: Support and/or and default operator logic in text fields
authorMartin Taal <martin.taal@openbravo.com>
Wed, 30 Nov 2011 11:15:09 +0100
changeset 14760 d4b1d314aa16
parent 14759 96217c7caa45
child 14761 a7b3f3c206e4
Fixes issue 18747: Support and/or and default operator logic in text fields
.hgignore
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
--- a/.hgignore	Wed Nov 30 10:26:59 2011 +0100
+++ b/.hgignore	Wed Nov 30 11:15:09 2011 +0100
@@ -43,3 +43,5 @@
 
 sources
 scripts
+modules/org.openbravo.activitii/*
+modules/org.openbravo.widgetinform.demo/*
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Wed Nov 30 10:26:59 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Wed Nov 30 11:15:09 2011 +0100
@@ -344,6 +344,9 @@
     if (result.criteria && result.criteria.length === 0) {
       result = null;
     }
+    if (!result.fieldName) {
+      result.fieldName = fieldName;
+    }
   
     return result;
   },