[FIX] deferred problems when clicking too quickly on some menu items

lp bug: https://launchpad.net/bugs/1100280 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130322162310-135hd0hoak8k5oq6

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index b69ec6d..3c89ef7 100644 (file)
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -578,7 +578,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.no_leaf = !!context['group_by_no_leaf'];
         this.grouped = !!group_by;
 
-        return this.load_view(context).then(
+        return this.alive(this.load_view(context)).then(
             this.proxy('reload_content'));
     },
     /**

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index befbc7f..0a72503 100644 (file)
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1011,7 +1011,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
     switch_mode: function (view_type, no_store, options) {
         var self = this;
 
-        return $.when(this._super.apply(this, arguments)).done(function () {
+        return this.alive($.when(this._super.apply(this, arguments))).done(function () {
             var controller = self.views[self.active_view].controller;
             self.$el.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', {
                 view: controller,