From f442c6575917e97fdd3de31e9af360aeb854799c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 22 Dec 2011 10:40:12 +0100 Subject: [PATCH] [IMP] Prefix dialog titles with translated action bzr revid: fme@openerp.com-20111222094012-ldm50y0kbeb63o1l --- addons/web/static/src/js/view_form.js | 115 +++++++++++++++++--------- 1 file changed, 74 insertions(+), 41 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7b808d897d6..8b90548355f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1749,7 +1749,14 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({ return; } var pop = new openerp.web.form.FormOpenPopup(self.view); - pop.show_element(self.field.relation, self.value[0],self.build_context(), {title: self.string || self.name}); + pop.show_element( + self.field.relation, + self.value[0], + self.build_context(), + { + title: _t("Open: ") + (self.string || self.name) + } + ); pop.on_write_completed.add_last(function() { self.set_value(self.value[0]); }); @@ -1909,13 +1916,17 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({ _search_create_popup: function(view, ids, context) { var self = this; var pop = new openerp.web.form.SelectCreatePopup(this); - pop.select_element(self.field.relation,{ - title: this.string || this.name, + pop.select_element( + self.field.relation, + { + title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + (this.string || this.name), initial_ids: ids ? _.map(ids, function(x) {return x[0]}) : undefined, initial_view: view, disable_multiple_selection: true - }, self.build_domain(), - new openerp.web.CompoundContext(self.build_context(), context || {})); + }, + self.build_domain(), + new openerp.web.CompoundContext(self.build_context(), context || {}) + ); pop.on_select_elements.add(function(element_ids) { var dataset = new openerp.web.DataSetStatic(self, self.field.relation, self.build_context()); dataset.name_get([element_ids[0]], function(data) { @@ -2333,22 +2344,27 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({ var self = this; var pop = new openerp.web.form.SelectCreatePopup(this); pop.on_default_get.add(self.dataset.on_default_get); - pop.select_element(self.o2m.field.relation,{ - title: self.name, - initial_view: "form", - alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, - create_function: function(data, callback, error_callback) { - return self.o2m.dataset.create(data).then(function(r) { - self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r.result])); - self.o2m.dataset.on_change(); - }).then(callback, error_callback); + pop.select_element( + self.o2m.field.relation, + { + title: _t("Create: ") + self.name, + initial_view: "form", + alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, + create_function: function(data, callback, error_callback) { + return self.o2m.dataset.create(data).then(function(r) { + self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r.result])); + self.o2m.dataset.on_change(); + }).then(callback, error_callback); + }, + read_function: function() { + return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); + }, + parent_view: self.o2m.view, + form_view_options: {'not_interactible_on_create':true} }, - read_function: function() { - return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); - }, - parent_view: self.o2m.view, - form_view_options: {'not_interactible_on_create':true} - }, self.o2m.build_domain(), self.o2m.build_context()); + self.o2m.build_domain(), + self.o2m.build_context() + ); pop.on_select_elements.add_last(function() { self.o2m.reload_current_view(); }); @@ -2357,17 +2373,22 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({ do_activate_record: function(index, id) { var self = this; var pop = new openerp.web.form.FormOpenPopup(self.o2m.view); - pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(),{ - title: self.name, - auto_write: false, - alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, - parent_view: self.o2m.view, - read_function: function() { - return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); - }, - form_view_options: {'not_interactible_on_create':true}, - readonly: self.o2m.is_readonly() - }); + pop.show_element( + self.o2m.field.relation, + id, + self.o2m.build_context(), + { + title: _t("Open: ") + self.name, + auto_write: false, + alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined, + parent_view: self.o2m.view, + read_function: function() { + return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); + }, + form_view_options: {'not_interactible_on_create':true}, + readonly: self.o2m.is_readonly() + } + ); pop.on_write.add(function(id, data) { self.o2m.dataset.write(id, data, {}, function(r) { self.o2m.reload_current_view(); @@ -2480,9 +2501,14 @@ openerp.web.form.Many2ManyDataSet = openerp.web.DataSetStatic.extend({ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends openerp.web.form.Many2ManyListView# */{ do_add_record: function () { var pop = new openerp.web.form.SelectCreatePopup(this); - pop.select_element(this.model, {title: this.name}, + pop.select_element( + this.model, + { + title: _t("Add: ") + this.name + }, new openerp.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]), - this.m2m_field.build_context()); + this.m2m_field.build_context() + ); var self = this; pop.on_select_elements.add(function(element_ids) { _.each(element_ids, function(element_id) { @@ -2497,7 +2523,9 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open do_activate_record: function(index, id) { var self = this; var pop = new openerp.web.form.FormOpenPopup(this); - pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), {title: this.name}); + pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), { + title: _t("Open: ") + this.name + }); pop.on_write_completed.add_last(function() { self.reload_content(); }); @@ -2534,9 +2562,12 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope this.initial_ids = this.options.initial_ids; this.created_elements = []; this.render_element(); - openerp.web.form.dialog(this.$element, {close:function() { - self.check_exit(); - }, title: options.title || ""}); + openerp.web.form.dialog(this.$element, { + close: function() { + self.check_exit(); + }, + title: options.title || "" + }); this.start(); }, start: function() { @@ -2723,10 +2754,12 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp this.context = context || {}; this.options = _.defaults(options || {}, {"auto_write": true}); this.render_element(); - this.$element.dialog({title: options.title || '', - modal: true, - width: 960, - height: 600}); + this.$element.dialog({ + title: options.title || '', + modal: true, + width: 960, + height: 600 + }); this.start(); }, start: function() {