summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvta vta@openerp.com <>2012-10-12 15:10:44 +0200
committervta vta@openerp.com <>2012-10-12 15:10:44 +0200
commit49c1c88962dbd4c47fefa33d190a8a6ff6b940c2 (patch)
tree303418c837b52fa7db35d29ea423ed6fef5d9204
parent40d2a376ca8e6ea7c66ebf77a13b11f48257977e (diff)
[FIX] Fixed naming related to selected_elements.
bzr revid: vta@openerp.com-20121012131044-w4afp0shefzwlo7t
-rw-r--r--addons/web/static/src/js/view_form.js20
-rw-r--r--addons/web_diagram/static/src/js/diagram.js4
-rw-r--r--addons/web_gantt/static/src/js/gantt.js2
-rw-r--r--addons/web_kanban/static/src/js/kanban.js2
4 files changed, 14 insertions, 14 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ee790d8f94a..266092ebdfe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2881,7 +2881,7 @@ instance.web.form.CompletionFieldMixin = {
self.build_domain(),
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.focus();
});
@@ -3600,7 +3600,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", self, function() {
+ pop.on("elements_selected", self, function() {
self.o2m.reload_current_view();
});
},
@@ -3686,7 +3686,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
self.o2m.build_domain(),
self.o2m.build_context()
);
- pop.on("select_elements", self, function() {
+ pop.on("elements_selected", self, function() {
self.o2m.reload_current_view();
});
}
@@ -4123,7 +4123,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
this.m2m_field.build_context()
);
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) {
if(! _.detect(self.dataset.ids, function(x) {return x == 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]]),
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) {
if(! _.detect(self.dataset.ids, function(x) {return x == 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();
});
},
- elements_selected: function(element_ids) {
- this.trigger("select_elements",element_ids);
+ select_elements: function(element_ids) {
+ this.trigger("elements_selected", element_ids);
},
check_exit: function(no_destroy) {
if (this.created_elements.length > 0) {
- this.elements_selected(this.created_elements);
+ this.select_elements(this.created_elements);
this.created_elements = [];
}
this.destroy();
@@ -4574,7 +4574,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
});
var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
$sbutton.click(function() {
- self.elements_selected(self.selected_ids);
+ self.select_elements(self.selected_ids);
self.destroy();
});
});
@@ -4616,7 +4616,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({
this.popup.new_object();
},
select_record: function(index) {
- this.popup.elements_selected([this.dataset.ids[index]]);
+ this.popup.select_elements([this.dataset.ids[index]]);
this.popup.destroy();
},
do_select: function(ids, records) {
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 8672c9a0742..4bae1aed3db 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({
self.dataset.domain,
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);
});
@@ -325,7 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({
this.dataset.domain,
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);
});
// We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes.
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 32bfea8e212..01de4f69b61 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -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", self, function() {
+ pop.on("elements_selected", self, function() {
self.reload();
});
pop.select_element(
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 37aea87e50e..d884fa6e6a2 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
[],
{"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.trigger('added', element_ids[0]);
});