odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed naming related to selected_elements. 

bzr revid: vta@openerp.com-20121012131044-w4afp0shefzwlo7t
This commit is contained in:
vta vta@openerp.com 2012-10-12 15:10:44 +02:00
parent 40d2a376ca
commit 49c1c88962
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/web/static/src/js/view_form.js
View File

@ -2881,7 +2881,7 @@ instance.web.form.CompletionFieldMixin = {
self.build_domain(), self.build_domain(),
new instance.web.CompoundContext(self.build_context(), context || {}) new instance.web.CompoundContext(self.build_context(), context || {})
); );
pop.on("select_elements",self,function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
self.add_id(element_ids[0]); self.add_id(element_ids[0]);
self.focus(); self.focus();
}); });
@ -3600,7 +3600,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
form_view_options: {'not_interactible_on_create':true}, form_view_options: {'not_interactible_on_create':true},
readonly: self.o2m.get("effective_readonly") readonly: self.o2m.get("effective_readonly")
}); });
pop.on("select_elements", self, function() { pop.on("elements_selected", self, function() {
self.o2m.reload_current_view(); self.o2m.reload_current_view();
}); });
}, },
@ -3686,7 +3686,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
self.o2m.build_domain(), self.o2m.build_domain(),
self.o2m.build_context() self.o2m.build_context()
); );
pop.on("select_elements", self, function() { pop.on("elements_selected", self, function() {
self.o2m.reload_current_view(); self.o2m.reload_current_view();
}); });
} }
@ -4123,7 +4123,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
this.m2m_field.build_context() this.m2m_field.build_context()
); );
var self = this; var self = this;
pop.on("select_elements", self, function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
_.each(element_ids, function(one_id) { _.each(element_ids, function(one_id) {
if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@ -4238,7 +4238,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]), new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
this.build_context() this.build_context()
); );
pop.on("select_elements", self, function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
_.each(element_ids, function(one_id) { _.each(element_ids, function(one_id) {
if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@ -4458,12 +4458,12 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
self.view_form.do_show(); self.view_form.do_show();
}); });
}, },
elements_selected: function(element_ids) { select_elements: function(element_ids) {
this.trigger("select_elements",element_ids); this.trigger("elements_selected", element_ids);
}, },
check_exit: function(no_destroy) { check_exit: function(no_destroy) {
if (this.created_elements.length > 0) { if (this.created_elements.length > 0) {
this.elements_selected(this.created_elements); this.select_elements(this.created_elements);
this.created_elements = []; this.created_elements = [];
} }
this.destroy(); this.destroy();
@ -4574,7 +4574,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
}); });
var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
$sbutton.click(function() { $sbutton.click(function() {
self.elements_selected(self.selected_ids); self.select_elements(self.selected_ids);
self.destroy(); self.destroy();
}); });
}); });
@ -4616,7 +4616,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({
this.popup.new_object(); this.popup.new_object();
}, },
select_record: function(index) { select_record: function(index) {
this.popup.elements_selected([this.dataset.ids[index]]); this.popup.select_elements([this.dataset.ids[index]]);
this.popup.destroy(); this.popup.destroy();
}, },
do_select: function(ids, records) { do_select: function(ids, records) {

4
addons/web_diagram/static/src/js/diagram.js
View File

@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({
self.dataset.domain, self.dataset.domain,
self.context || self.dataset.context self.context || self.dataset.context
); );
pop.on("select_elements", self, function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
}); });
@ -325,7 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({
this.dataset.domain, this.dataset.domain,
this.context || this.dataset.context this.context || this.dataset.context
); );
pop.on("select_elements", self, function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); 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. // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes.

2
addons/web_gantt/static/src/js/gantt.js
View File

@ -222,7 +222,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
on_task_create: function() { on_task_create: function() {
var self = this; var self = this;
var pop = new instance.web.form.SelectCreatePopup(this); var pop = new instance.web.form.SelectCreatePopup(this);
pop.on("select_elements", self, function() { pop.on("elements_selected", self, function() {
self.reload(); self.reload();
}); });
pop.select_element( pop.select_element(

2
addons/web_kanban/static/src/js/kanban.js
View File

@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
[], [],
{"default_name": self.$input.val()} {"default_name": self.$input.val()}
); );
pop.on("select_elements", self, function(element_ids) { pop.on("elements_selected", self, function(element_ids) {
self.$input.val(""); self.$input.val("");
self.trigger('added', element_ids[0]); self.trigger('added', element_ids[0]);
}); });