[MERGE] Merge trunk-trigger-on_select_elements.

bzr revid: vta@openerp.com-20121011130632-0y4t5gmnnrj2fn0z
This commit is contained in:
vta vta@openerp.com
2012-10-11 15:06:32 +02:00
4 changed files with 14 additions and 14 deletions
+10 -9
View File
@@ -2873,7 +2873,7 @@ instance.web.form.CompletionFieldMixin = {
self.build_domain(),
new instance.web.CompoundContext(self.build_context(), context || {})
);
pop.on_select_elements.add(function(element_ids) {
pop.on("select_elements",self,function(element_ids) {
self.add_id(element_ids[0]);
self.focus();
});
@@ -3594,7 +3594,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
form_view_options: {'not_interactible_on_create':true},
readonly: self.o2m.get("effective_readonly")
});
pop.on_select_elements.add_last(function() {
pop.on("select_elements", self, function() {
self.o2m.reload_current_view();
});
},
@@ -3680,7 +3680,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
self.o2m.build_domain(),
self.o2m.build_context()
);
pop.on_select_elements.add_last(function() {
pop.on("select_elements", self, function() {
self.o2m.reload_current_view();
});
}
@@ -4117,7 +4117,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
this.m2m_field.build_context()
);
var self = this;
pop.on_select_elements.add(function(element_ids) {
pop.on("select_elements", self, function(element_ids) {
_.each(element_ids, function(one_id) {
if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@@ -4232,7 +4232,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
this.build_context()
);
pop.on_select_elements.add(function(element_ids) {
pop.on("select_elements", self, function(element_ids) {
_.each(element_ids, function(one_id) {
if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@@ -4452,11 +4452,12 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
self.view_form.do_show();
});
},
on_select_elements: function(element_ids) {
elements_selected: function(element_ids) {
this.trigger("select_elements",element_ids);
},
check_exit: function(no_destroy) {
if (this.created_elements.length > 0) {
this.on_select_elements(this.created_elements);
this.elements_selected(this.created_elements);
this.created_elements = [];
}
this.destroy();
@@ -4567,7 +4568,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
});
var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
$sbutton.click(function() {
self.on_select_elements(self.selected_ids);
self.elements_selected(self.selected_ids);
self.destroy();
});
});
@@ -4609,7 +4610,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({
this.popup.new_object();
},
select_record: function(index) {
this.popup.on_select_elements([this.dataset.ids[index]]);
this.popup.elements_selected([this.dataset.ids[index]]);
this.popup.destroy();
},
do_select: function(ids, records) {
+2 -3
View File
@@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({
self.dataset.domain,
self.context || self.dataset.context
);
pop.on_select_elements.add_last(function(element_ids) {
pop.on("select_elements", self, function(element_ids) {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
});
@@ -325,8 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({
this.dataset.domain,
this.context || this.dataset.context
);
pop.on_select_elements.add_last(function(element_ids) {
pop.on("select_elements", self, function(element_ids) {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
});
// We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes.
+1 -1
View File
@@ -222,7 +222,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
on_task_create: function() {
var self = this;
var pop = new instance.web.form.SelectCreatePopup(this);
pop.on_select_elements.add_last(function() {
pop.on("select_elements", self, function() {
self.reload();
});
pop.select_element(
+1 -1
View File
@@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
[],
{"default_name": self.$input.val()}
);
pop.on_select_elements.add(function(element_ids) {
pop.on("select_elements", self, function(element_ids) {
self.$input.val("");
self.trigger('added', element_ids[0]);
});