diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-08-25 10:22:21 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-08-25 10:22:21 +0200 |
| commit | d2da68ad8b66e2c93c4552cb47bde7a34378c635 (patch) | |
| tree | dd0c75da52d3a6c0bee855ce028c9cc43bf9d9c5 /addons/base/static/src | |
| parent | de955d098388688206f10c4858b178ad054acd88 (diff) | |
[FIX] actually fix race condition on listview init: incorrect on_mode_switch override in xmo@openerp.com-20110816123510-gcx0dk8b2sgox5oi did not propagate primise from ViewManager's on_mode_switch
bzr revid: xmo@openerp.com-20110825082221-tasmo3je0wu4iw6h
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/js/views.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index c6782150297..7f6d78d9495 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -325,8 +325,9 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ } }, on_mode_switch: function (view_type) { - this._super(view_type); - this.shortcut_check(this.views[view_type]); + return $.when( + this._super(view_type), + this.shortcut_check(this.views[view_type])); }, shortcut_check : function(view) { var self = this; |
