details:   /erp/devel/pi/rev/c5cc31628ba3
changeset: 10848:c5cc31628ba3
user:      Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date:      Wed Feb 23 16:12:52 2011 +0100
summary:   [OBUISEL] Filter selector by organization also when editing a record 
on grid mode.

diffstat:

 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
 |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r c23af0af900f -r c5cc31628ba3 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
--- 
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
      Wed Feb 23 15:36:11 2011 +0100
+++ 
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
      Wed Feb 23 16:12:52 2011 +0100
@@ -91,6 +91,8 @@
         // also adds the special ORG parameter
         if (this.selector.form.getField('organization')) {
           criteria[OB.Constants.ORG_PARAMETER] = 
this.selector.form.getValue('organization');
+        } else if (criteria.inpadOrgId) {
+          criteria[OB.Constants.ORG_PARAMETER] = criteria.inpadOrgId;
         }
         criteria[OB.Constants.WHERE_PARAMETER] = this.selector.whereClause;
         
@@ -400,14 +402,16 @@
     // do not prevent the count operation
     criteria[isc.OBViewGrid.NO_COUNT_PARAMETER] = 'false';
 
+    // on purpose not passing the third boolean param
+    isc.addProperties(criteria, this.form.view.getContextInfo(false, true));
+    
     // also add the special ORG parameter
     if (this.form.getField('organization')) {
       criteria[OB.Constants.ORG_PARAMETER] = 
this.form.getValue('organization');
+    } else if (criteria.inpadOrgId) {
+      criteria[OB.Constants.ORG_PARAMETER] = criteria.inpadOrgId;
     }
     
-    // on purpose not passing the third boolean param
-    isc.addProperties(criteria, this.form.view.getContextInfo(false, true));
-    
     // adds the selector id to filter used to get filter information
     criteria._selectorDefinitionId = this.selectorDefinitionId;
     

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to