From 5fe4ff9c49e741c607ae33279552c6ae492f87ab Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Jul 2012 16:57:04 +0200 Subject: [PATCH] [FIX] move setElement init call from WidgetMixin to Widget Widget is the one providing both setElement and _make_descriptive... bzr revid: xmo@openerp.com-20120726145704-uzg7ufntvf24gnyd --- addons/web/static/src/js/corelib.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 3fafcab26fb..370fe74e63e 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -514,7 +514,6 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { */ init: function(parent) { instance.web.CallbackEnabledMixin.init.call(this); - this.setElement(this._make_descriptive()); this.setParent(parent); }, /** @@ -689,6 +688,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { */ init: function(parent) { instance.web.WidgetMixin.init.call(this,parent); + // FIXME: this should not be + this.setElement(this._make_descriptive()); this.session = instance.connection; }, /**