details:   https://code.openbravo.com/erp/devel/pi/rev/be2d028b01bc
changeset: 13855:be2d028b01bc
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Wed Sep 28 16:36:34 2011 +0200
summary:   Related to issue 18587: Changes/improvement saved and named views
Form layout changes are now also saved

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
             |  23 +++++----
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
 |   6 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diffs (51 lines):

diff -r 4247a7eb8792 -r be2d028b01bc 
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
       Wed Sep 28 11:41:42 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
       Wed Sep 28 16:36:34 2011 +0200
@@ -185,18 +185,21 @@
    
   getFormPersonalization: function(view) {
     var formPersonalization, i, persView;
-    if (this.getClass().personalization && 
this.getClass().personalization.views 
-        && this.selectedPersonalizationId) {
-      for (i = 0; i < this.getClass().personalization.views.length; i++) {
-        persView = this.getClass().personalization.views[i];
-        if (persView.viewDefinition && 
-            persView.viewDefinition[view.tabId] && 
-            persView.personalizationId === this.selectedPersonalizationId) {
-          return persView.viewDefinition[view.tabId].form;
+    if (!this.getClass().personalization || 
!this.getClass().personalization.forms) {
+      // no form personalization on form level
+      // check window level
+      if (this.getClass().personalization && 
this.getClass().personalization.views 
+          && this.selectedPersonalizationId) {
+        for (i = 0; i < this.getClass().personalization.views.length; i++) {
+          persView = this.getClass().personalization.views[i];
+          if (persView.viewDefinition && 
+              persView.viewDefinition[view.tabId] && 
+              persView.personalizationId === this.selectedPersonalizationId) {
+            return persView.viewDefinition[view.tabId].form;
+          }
         }
       }
-    }
-    if (!this.getClass().personalization || 
!this.getClass().personalization.forms) {
+      // nothing found go away
       return null;
     }
     formPersonalization = this.getClass().personalization.forms;
diff -r 4247a7eb8792 -r be2d028b01bc 
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
   Wed Sep 28 11:41:42 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
   Wed Sep 28 16:36:34 2011 +0200
@@ -988,9 +988,9 @@
       window = this.maintenanceView.standardWindow;
     } else if (this.openedInForm) {
       if (this.hasBeenSaved || this.hasBeenDeleted) {
-        // reread the window settings
-        // this will update everything in the original forms
-        this.form.view.standardWindow.readWindowSettings();
+        // update the form in the view
+        OB.Personalization.personalizeForm(me.personalizationData, 
+            this.form.view.viewForm);
       }
       window = this.form.view.standardWindow;
     }

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to