diff options
| author | Olivier Dony <odo@openerp.com> | 2012-09-24 17:26:28 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-09-24 17:26:28 +0200 |
| commit | b9ca7ca0955f91db5cd5ac77c0a7ef29a80dd86d (patch) | |
| tree | 8f37fe0ec5793e96b9c1e013d86ba998966df75e /addons/web/static/src | |
| parent | c24639180a569f870500b4a89f47497c08c8b462 (diff) | |
[FIX] OPW 577261, 573269: properly refresh one2many records after clicking on a form button
This patch reverts the previous patch for OPW 573269
that did not properly fix all cases (workflow buttons
for instance). This is a backport of the trunk fix.
previous fix: rev-id: xal@openerp.com-20120417145330-ln0mpp06s886z1us
trunk fix: r.3104 rev-id: nicolas.vanhoren@openerp.com-20120924125355-m1b53sjb6hle789z
bzr revid: odo@openerp.com-20120924152628-fj2tp1yezjx5htx0
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 868cdc266ec..53111c9a84e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -661,6 +661,15 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# return self.dataset.parent_view.recursive_save(); }); }, + recursive_reload: function() { + var self = this; + var pre = $.when(); + if (self.dataset.parent_view) + pre = self.dataset.parent_view.recursive_reload(); + return pre.pipe(function() { + return self.reload(); + }); + }, is_dirty: function() { return _.any(this.fields, function (value) { return value.is_dirty(); @@ -1325,7 +1334,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({ return this.view.do_execute_action( _.extend({}, this.node.attrs, {context: context}), this.view.dataset, this.view.datarecord.id, function () { - self.view.reload(); + self.view.recursive_reload(); }); }, update_dom: function() { @@ -2801,11 +2810,6 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({ form_view_options: {'not_interactible_on_create':true}, readonly: self.o2m.is_readonly() }); - pop.dataset.call_button = function() { - var button_result = self.o2m.dataset.call_button.apply(self.o2m.dataset, arguments); - self.o2m.reload_current_view(); - return button_result; - }; pop.on_write.add(function(id, data, options) { self.o2m.dataset.write(id, data, options, function(r) { self.o2m.reload_current_view(); |
