[MERGE] trunk-trigger-on_controller_inited.

bzr revid: vta@openerp.com-20121012093328-hr52zgwk5ygdh9mu
This commit is contained in:
vta vta@openerp.com
2012-10-12 11:33:28 +02:00
2 changed files with 2 additions and 10 deletions
+1 -1
View File
@@ -3371,7 +3371,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")) {
+1 -9
View File
@@ -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.on_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) {
@@ -652,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
*/