From 1399d19e3e9ff34dd0fa49aa76de28de3f28cf5d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 21 Jun 2011 12:22:46 +0200
Subject: [FIX] Reload record in form view on_created and on_saved

bzr revid: fme@openerp.com-20110621102246-91w528ppy8jf4bmi
---
 addons/base/static/src/js/form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base/static/src/js/form.js')

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 90357325928..18d6976e99c 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1,4 +1,3 @@
-
 openerp.base.form = function (openerp) {
 
 openerp.base.views.add('form', 'openerp.base.FormView');
@@ -299,6 +298,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
             if (success) {
                 success(r);
             }
+            this.reload();
         }
     },
     /**
@@ -333,6 +333,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
             if (success) {
                 success(_.extend(r, {created: true}));
             }
+            this.reload();
         }
     },
     do_search: function (domains, contexts, groupbys) {
-- 
cgit v1.2.3


From 884aaa86079542a6be8dd3797c50390cf8893e03 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 21 Jun 2011 14:41:16 +0200
Subject: [FIX] Fixed selection widget. Wrongly select first option when value
 is false

bzr revid: fme@openerp.com-20110621124116-rh6pv2a1v2de186q
---
 addons/base/static/src/js/form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base/static/src/js/form.js')

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 18d6976e99c..7cb36cdc0c2 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -84,6 +84,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         this.$element.hide();
     },
     on_record_loaded: function(record) {
+        console.info(record)
         this.touched = false;
         if (record) {
             this.datarecord = record;
@@ -996,7 +997,7 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
         if (value != null && value !== false) {
             this.$element.find('select').val(value);
         } else {
-            this.$element.find('select')[0].selectedIndex = 0;
+            this.$element.find('select').val('false');
         }
     },
     set_value_from_ui: function() {
-- 
cgit v1.2.3


From c57a3e0d98229ed66dde92c5caad39f6bc0efdbd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 21 Jun 2011 16:38:04 +0200
Subject: [FIX] Fixed active_is in context for dialog actions

bzr revid: fme@openerp.com-20110621143804-b51tp8n0a393oixi
---
 addons/base/static/src/js/form.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'addons/base/static/src/js/form.js')

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 7cb36cdc0c2..d221872598d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -42,8 +42,12 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         if (this.embedded_view) {
             return $.Deferred().then(this.on_loaded).resolve({fields_view: this.embedded_view});
         } else {
+            var context = new openerp.base.CompoundContext(this.dataset.context);
+            if (this.view_manager.action && this.view_manager.action.context) {
+                context.add(this.view_manager.action.context);
+            }
             return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id,
-                toolbar:!!this.flags.sidebar}, this.on_loaded);
+                toolbar:!!this.flags.sidebar, context: context}, this.on_loaded);
         }
     },
     on_loaded: function(data) {
@@ -84,7 +88,6 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         this.$element.hide();
     },
     on_record_loaded: function(record) {
-        console.info(record)
         this.touched = false;
         if (record) {
             this.datarecord = record;
@@ -226,8 +229,12 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
     },
     on_button_new: function() {
         var self = this;
+        var context = new openerp.base.CompoundContext(this.dataset.context);
+        if (this.view_manager.action && this.view_manager.action.context) {
+            context.add(this.view_manager.action.context);
+        }
         $.when(this.has_been_loaded).then(function() {
-            self.dataset.default_get(_.keys(self.fields_view.fields), function(result) {
+            self.dataset.default_get(_.keys(self.fields_view.fields), context, function(result) {
                 self.on_record_loaded(result.result);
             });
         });
-- 
cgit v1.2.3