[MERGE] web: readonly field in a class linked by a many2one doesn't refresh after clicking on a button (cherrypicked from trunk)

bzr revid: xal@openerp.com-20120420112812-pxxqg9zp61hetv2h
This commit is contained in:
Xavier ALT
2012-04-20 13:28:12 +02:00
parent cc02fc9c3f
commit 59de9b11fe
+3 -1
View File
@@ -515,10 +515,11 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
save_deferral = self.dataset.create(values).pipe(function(r) {
return self.on_created(r, undefined, prepend_on_create);
}, null);
} else if (_.isEmpty(values)) {
} else if (_.isEmpty(values) && ! self.force_dirty) {
//console.log("FormView(", self, ") : Nothing to save");
save_deferral = $.Deferred().resolve({}).promise();
} else {
self.force_dirty = false;
//console.log("FormView(", self, ") : About to save", values);
save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) {
return self.on_saved(r);
@@ -1251,6 +1252,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
}
};
if (!this.node.attrs.special) {
this.view.force_dirty = true;
return this.view.recursive_save().pipe(exec_action);
} else {
return exec_action();