summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic/basic_controller.js
diff options
context:
space:
mode:
authorElkasitu <adt@odoo.com>2017-07-13 11:13:57 +0200
committerElkasitu <adt@odoo.com>2017-07-13 13:10:30 +0200
commit0c496136a9e3eb4dd779e0ac019f1ed9341df152 (patch)
tree59e3bebd28bf23113079093a82f4eabe7e048806 /addons/web/static/src/js/views/basic/basic_controller.js
parent60ee6bbda51a960e3812a70d82854929c2e22081 (diff)
[FIX] web: Discard from form view to form view
Clicking on the discard button in a form view whose previous view is another form view wouldn't do anything. This is fixed by making the view_manager trigger_up a history_back event and then the history_back callback will handle cases in which there is only one view and only one action, which used to be rejected
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_controller.js')
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 82dc6f90d26..cc72816a85d 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -250,7 +250,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
on_fail: function (reason) {
reload().always(function() {
def.reject(reason);
- })
+ });
},
on_success: def.resolve.bind(def),
});