From 09a3f7b86cd66704ca9afccf737459b92a6685bd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 22 Jul 2011 17:59:48 +0200
Subject: [PATCH] [fix] corrected al's apparent inability to copy paste without
 adding bugs

bzr revid: nicolas.vanhoren@openerp.com-20110722155948-1vgw3g03jqr0ni6b
---
 addons/base/static/src/js/chrome.js     | 1 +
 addons/base/static/src/js/controller.js | 7 +++++--
 addons/base/static/src/js/views.js      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 33aa311e9a2..75f8a015fa8 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -534,6 +534,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
         if(this.$element != null) {
             this.$element.remove();
         }
+        this._super();
     },
     /**
      * Render the widget. This.template must be defined.
diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index a5c7bca4b53..10355a267a3 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -137,8 +137,7 @@ instance.base.BasicController = instance.base.Class.extend( /** @lends instance.
             instance.screen[element_id] = this;
         }
         // save the parent children relationship
-        this.controller_parent = null;
-        this.controller_children = [];
+        this.children = [];
         this.parent = parent;
         if(this.parent &&  this.parent.children) {
             this.parent.children.push(this);
@@ -174,6 +173,10 @@ instance.base.BasicController = instance.base.Class.extend( /** @lends instance.
         return $.Deferred().done().promise();
     },
     stop: function() {
+        if (this.parent && this.parent.children) {
+            this.parent.children = _.without(this.parent.children, this);
+        }
+        this.parent = null;
     },
     log: function() {
         var args = Array.prototype.slice.call(arguments);
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index d14fdcbc12f..1ee17bdab4b 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -11,7 +11,7 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
         this.viewmanager = null;
         this.current_dialog = null;
         // Temporary linking view_manager to session.
-        // Will use controller_parent to find it when implementation will be done.
+        // Will use parent to find it when implementation will be done.
         this.session.action_manager = this;
     },
     /**