diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-09-13 08:38:30 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-09-13 08:38:30 +0200 |
| commit | 2f05581439e09d3a85634fcb0de9ed54fa1714f2 (patch) | |
| tree | 1b994d3b3fb561adc858f20497a2403b27fc61d0 /addons/web/static/src | |
| parent | 2f7229de36f6916217496ddaa0761e869661b66b (diff) | |
[FIX] correctly return readyness deferred from ViewManagerAction's start method
bzr revid: xmo@openerp.com-20110913063830-eyyfczieq6w1b1j4
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e1554249ad6..3ccdd672a0d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -345,11 +345,12 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner var main_view_loaded = this._super(); - // schedule auto_search + var manager_ready = $.when(searchview_loaded, main_view_loaded); if (searchview_loaded && this.action['auto_search']) { - $.when(searchview_loaded, main_view_loaded) - .then(this.searchview.do_search); + // schedule auto_search + manager_ready.then(this.searchview.do_search); } + return manager_ready; }, on_mode_switch: function (view_type) { return $.when( |