details:   https://code.openbravo.com/erp/devel/pi/rev/4ffb58cf9d23
changeset: 14046:4ffb58cf9d23
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Fri Oct 21 16:01:57 2011 +0200
summary:   Fixes issue 18836: Query list widget is not creating new datasources 
on new, not destroying datasource on destroy

diffstat:

 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
 |   2 +
 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
       |   6 +++-
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
          |  13 +++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r 89fd05b465de -r 4ffb58cf9d23 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
--- 
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
      Fri Oct 21 13:46:10 2011 +0200
+++ 
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
      Fri Oct 21 16:01:57 2011 +0200
@@ -23,6 +23,8 @@
 
 isc.OBWidgetInFormItem.addProperties({
   widgetInstance : null,
+  autoDestroy: true,
+  
   cellStyle: 'OBFormField',
   titleStyle: 'OBFormFieldLabel',
   widgetProperties: {
diff -r 89fd05b465de -r 4ffb58cf9d23 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
--- 
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
    Fri Oct 21 13:46:10 2011 +0200
+++ 
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
    Fri Oct 21 16:01:57 2011 +0200
@@ -76,9 +76,11 @@
         + "', isc.OBQueryListWidget).addProperties({widgetId: '"
         + getWidgetClass().getId()
         + "', "
-        + "gridDataSource: "
+        + "gridDataSource: null,"
+        + "createGridDataSource: function() {"
+        + "return "
         + getDataSourceJavaScript()
-        + ", fields:"
+        + ";}, fields:"
         + QueryListUtils
             .getWidgetClassFields(getWidgetClass(), 
QueryListUtils.IncludeIn.WidgetView)
         + ", maximizedFields:"
diff -r 89fd05b465de -r 4ffb58cf9d23 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
--- 
a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
       Fri Oct 21 13:46:10 2011 +0200
+++ 
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
       Fri Oct 21 16:01:57 2011 +0200
@@ -50,6 +50,9 @@
         })
     ]
     });
+    
+    this.gridDataSource = this.createGridDataSource();
+
     this.Super('initWidget', arguments);
     this.widgetTitle = this.title;
     // refresh if the dbInstanceId is set
@@ -228,7 +231,7 @@
     }
     this.Super('initWidget', arguments);
   },
-
+  
   filterData: function(criteria, callback, requestProperties){
     var crit = criteria || {},
     reqProperties = requestProperties || {};
@@ -275,6 +278,14 @@
     return params;
   },
   
+  destroy: function() {
+    if (this.dataSource) {
+      this.dataSource.destroy();
+      this.dataSource = null;
+    }
+    this.Super('destroy', arguments);
+  },
+  
   fetchData: function(criteria, callback, requestProperties){
     var crit = criteria || {},
     reqProperties = requestProperties || {};

------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn 
about Cisco certifications, training, and career opportunities. 
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to