diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-22 18:27:01 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-22 18:27:01 +0200 |
| commit | 7d0a18e84c933ba7febe1b51f92b62f8dbc22c08 (patch) | |
| tree | 8f4d1fd426ad7c2db58194a6fd8f837e2898c0e9 /addons/base/static/src/js/controller.js | |
| parent | fb188260939d1ea3367e3ffa243e5e1e9d0840e2 (diff) | |
[fix] lot of bugs with contollers due to merge
bzr revid: nicolas.vanhoren@openerp.com-20110722162701-me9jag18dp5m05wz
Diffstat (limited to 'addons/base/static/src/js/controller.js')
| -rw-r--r-- | addons/base/static/src/js/controller.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js index 54e876295f7..c9ca3193e70 100644 --- a/addons/base/static/src/js/controller.js +++ b/addons/base/static/src/js/controller.js @@ -202,8 +202,10 @@ instance.base.Controller = instance.base.Class.extend( /** @lends instance.base. stop: function() { if (this.parent && this.parent.children) { this.parent.children = _.without(this.parent.children, this); + this.parent.controller_children = this.parent.children; } this.parent = null; + this.controller_parent = null; }, log: function() { var args = Array.prototype.slice.call(arguments); |