diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-10-26 10:45:43 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-10-26 10:45:43 +0200 |
| commit | 04282ff00e8fa70c3eb0e9a48ba0cd32aa0e1cd7 (patch) | |
| tree | 4750c6e5f62d2f20924807ef33a334c55c5be0f0 /addons/web/static/src/js/views.js | |
| parent | 99a2dd3938c7d7d4b7e9c724ec8acbb5eeedf35f (diff) | |
[IMP] port search test to new framework, add handling of web.{submodule} dependencies
bzr revid: xmo@openerp.com-20121026084543-fobkc3ta5q2jc3q6
Diffstat (limited to 'addons/web/static/src/js/views.js')
| -rw-r--r-- | addons/web/static/src/js/views.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 9390f753be7..03aff76ca2f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -495,7 +495,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ .find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]') .parent().addClass('active'); - r = $.when(view_promise).then(function () { + return $.when(view_promise).then(function () { _.each(_.keys(self.views), function(view_name) { var controller = self.views[view_name].controller; if (controller) { @@ -511,7 +511,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ }); self.trigger('switch_mode', view_type, no_store, view_options); }); - return r; }, do_create_view: function(view_type) { // Lazy loading of views |