details:   https://code.openbravo.com/erp/devel/pi/rev/cd4d937d352b
changeset: 15136:cd4d937d352b
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Thu Jan 12 17:45:24 2012 +0100
summary:   Related to issue 19422: Grid personalization not stored
Apply grid/form preference in case there is no default

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
             |  7 ++++---
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
 |  2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r c263f4e3ec22 -r cd4d937d352b 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
       Thu Jan 12 17:36:12 2012 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
       Thu Jan 12 17:45:24 2012 +0100
@@ -260,7 +260,7 @@
       // maybe do this in a separate thread
       if (defaultView) {
         OB.Personalization.applyViewDefinition(defaultView.personalizationId, 
defaultView.viewDefinition, this);
-      } else if (!this.getClass().personalization.views || 
this.getClass().personalization.views.length === 0) {
+      } else { 
         // only apply the default form/grid if there are no views
         // otherwise you get strange interference
         // check the default form and grid viewstates
@@ -316,9 +316,9 @@
     if (defaultView && defaultView.viewDefinition && 
         defaultView.viewDefinition[tabId]) {
       return defaultView.viewDefinition[tabId].grid;
-    }
+    } 
         
-    if ((!personalization || !personalization.views || 
personalization.views.length === 0) && this.viewState && this.viewState[tabId]) 
{
+    if (this.viewState && this.viewState[tabId]) {
       return this.viewState[tabId];
     }
     
@@ -800,6 +800,7 @@
 
   storeViewState: function(){
     var result = {}, i, length = this.views.length;
+    
     for (i = 0; i < length; i++) {
       if ( this.views[i].viewGrid ) {
         result[this.views[i].tabId] = this.views[i].viewGrid.getViewState();
diff -r c263f4e3ec22 -r cd4d937d352b 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
   Thu Jan 12 17:36:12 2012 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
   Thu Jan 12 17:45:24 2012 +0100
@@ -597,7 +597,7 @@
   save: function(callback) {
     var params, me = this, newDataFields, 
       formPers = this.form.view.getFormPersonalization();
-
+    
     // if there is a personalization id then use that
     // this ensures that a specific record will be updated
     // on the server

------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to