summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2014-07-28 19:02:11 +0200
committerDenis Ledoux <dle@odoo.com>2014-07-28 19:02:11 +0200
commit767d2ea9a63ceb6d8473766f52eb06f69b281ca1 (patch)
treee52b1749851bf9821163b1e6ba0ab20aeee8994f /addons/web/static/src
parentb91a75f7eff85edd5d51a91d10d6e3be8a409030 (diff)
[FIX] web: on refresh, do search_read with fields passed
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7677ddfb9f5..78accfd4da4 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -653,8 +653,8 @@ instance.web.ViewManager = instance.web.Widget.extend({
var container = this.$el.find("> .oe_view_manager_body > .oe_view_manager_view_" + view_type);
var view_promise = controller.appendTo(container);
this.views[view_type].controller = controller;
- this.views[view_type].deferred.resolve(view_type);
return $.when(view_promise).done(function() {
+ self.views[view_type].deferred.resolve(view_type);
if (self.searchview
&& self.flags.auto_search
&& view.controller.searchable !== false) {
@@ -1071,7 +1071,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
);
}
- $.when(defs).done(function() {
+ $.when(this.views[this.active_view] ? this.views[this.active_view].deferred : $.when(), defs).done(function() {
self.views[self.active_view].controller.do_load_state(state, warm);
});
},