summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2013-02-18 12:49:11 +0100
committerFabien Meghazi <fme@openerp.com>2013-02-18 12:49:11 +0100
commit98a9bb5376f8ddf995083cb64266cde7d6cd3ebc (patch)
tree876129d09efa0481831d9ef04fd6e3c4340d731d
parent6fe0dd8032b058ebb580df320c6b77d93e55d575 (diff)
[FIX] ViewManagerAction's do_create_view() does not pipe _super's deferred.
bzr revid: fme@openerp.com-20130218114911-wpack9pfkr3pn0a2
-rw-r--r--addons/web/static/src/js/views.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2cbd966b6bb..47986f1da47 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -996,10 +996,11 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
});
},
do_create_view: function(view_type) {
- var r = this._super.apply(this, arguments);
- var view = this.views[view_type].controller;
- view.set({ 'title': this.action.name });
- return r;
+ var self = this;
+ return this._super.apply(this, arguments).then(function() {
+ var view = self.views[view_type].controller;
+ view.set({ 'title': self.action.name });
+ });
},
get_action_manager: function() {
var cur = this;