From 09a3f7b86cd66704ca9afccf737459b92a6685bd Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 22 Jul 2011 17:59:48 +0200 Subject: [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/controller.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'addons/base/static/src/js/controller.js') 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); -- cgit v1.2.3