diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-22 14:40:12 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-22 14:40:12 +0200 |
| commit | 978c76c5ea6bf16f7db2f94630ceb4b27caec037 (patch) | |
| tree | a4b9df9adb7a2da892818dc7dfcbc2c760938528 /addons/web/static/src | |
| parent | d4d6e882668cfdc7c4634a0e30a047d0c83c75a7 (diff) | |
| parent | 23c5622e711e7324ecf3517b08c72791bacab238 (diff) | |
[MERGE] [IMP] mail: improved management of links in notification emails.
This branch adds the URL parameters in context.params.
bzr revid: tde@openerp.com-20130522124012-pf2m5efmmz1vuilc
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 1143bdfc2af..0737281e199 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -241,6 +241,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ } else if (state.active_id) { add_context.active_ids = [state.active_id]; } + add_context.params = state; this.null_action(); action_loaded = this.do_action(state.action, { additional_context: add_context }); $.when(action_loaded || null).done(function() { @@ -1004,7 +1005,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ switch_mode: function (view_type, no_store, options) { var self = this; - return $.when(this._super.apply(this, arguments)).done(function () { + return this.alive($.when(this._super.apply(this, arguments))).done(function () { var controller = self.views[self.active_view].controller; self.$el.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', { view: controller, |