From b13ee21296c151cfb82ac8ede020efe83734649a Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 11 Oct 2012 16:13:41 +0530 Subject: [PATCH 1/3] [IMP]replace callenabled for on_controller_inited bzr revid: vja@tinyerp.com-20121011104341-7r4fr4l687bn9qqe --- addons/web/static/src/js/view_form.js | 2 +- addons/web/static/src/js/views.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index afb5e258c0b..efb5b5816f5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3372,7 +3372,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ var def = $.Deferred().then(function() { self.initial_is_loaded.resolve(); }); - this.viewmanager.on_controller_inited.add_last(function(view_type, controller) { + this.viewmanager.on("controller_inited", self, function(view_type, controller) { controller.o2m = self; if (view_type == "list") { if (self.get("effective_readonly")) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index f985e5f6dc8..ba6c95f96c1 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -409,6 +409,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.flags = flags || {}; this.registry = instance.web.views; this.views_history = []; + this.on("controller_inited",this.on_controller_inited); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -532,7 +533,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.on_controller_inited(view_type, controller); + self.trigger("controller_inited",view_type, controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { From 8b2731d819125bec6b67a46d26898be30264933f Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 11 Oct 2012 19:00:31 +0530 Subject: [PATCH 2/3] [FIX]Improve code bzr revid: vja@tinyerp.com-20121011133031-83azb0qwjpq1b0aq --- addons/web/static/src/js/views.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ba6c95f96c1..4172344c66e 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -409,7 +409,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.flags = flags || {}; this.registry = instance.web.views; this.views_history = []; - this.on("controller_inited",this.on_controller_inited); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -533,7 +532,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.trigger("controller_inited",view_type, controller); + self.trigger("controller_inited",view_type,controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { @@ -653,14 +652,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ controller.do_search(results.domain, results.context, groupby || []); }); }, - /** - * Event launched when a controller has been inited. - * - * @param {String} view_type type of view - * @param {String} view the inited controller - */ - on_controller_inited: function(view_type, view) { - }, /** * Called when one of the view want to execute an action */ From f5216c706ae47ba23d265121f101e9d78d3f1407 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 14:24:17 +0530 Subject: [PATCH 3/3] [FIX]move the trigger function bzr revid: vja@tinyerp.com-20121012085417-rrql4iyrevscyt80 --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4172344c66e..e6439c28efe 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -532,12 +532,12 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.trigger("controller_inited",view_type,controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { self.searchview.ready.then(self.searchview.do_search); } + self.trigger("controller_inited",view_type,controller); }); }, set_title: function(title) {