diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0cde20535ad..e79276458b3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -152,14 +152,14 @@ instance.web.FormView = instance.web.View.extend({ get_qweb_context: function(record) { var self = this, new_record = {}; - _.each(record, function(value, name) { + _.each(record, function(value_, name) { var r = _.clone(self.fields_view.fields[name] || {}); - if ((r.type === 'date' || r.type === 'datetime') && value) { - r.raw_value = instance.web.auto_str_to_date(value); + if ((r.type === 'date' || r.type === 'datetime') && value_) { + r.raw_value = instance.web.auto_str_to_date(value_); } else { - r.raw_value = value; + r.raw_value = value_; } - r.value = instance.web.format_value(value, r); + r.value = instance.web.format_value(value_, r); new_record[name] = r; }); return { @@ -357,8 +357,8 @@ instance.web.FormView = instance.web.View.extend({ } // form field if (self.fields[field]) { - var value = self.fields[field].get_value(); - return value == null ? false : value; + var value_ = self.fields[field].get_value(); + return value_ == null ? false : value_; } // parent field var splitted = field.split('.'); @@ -421,17 +421,17 @@ instance.web.FormView = instance.web.View.extend({ } if (widget.field['change_default']) { - var fieldname = widget.name, value; + var fieldname = widget.name, value_; if (response.value && (fieldname in response.value)) { // Use value from onchange if onchange executed - value = response.value[fieldname]; + value_ = response.value[fieldname]; } else { // otherwise get form value for field - value = self.fields[fieldname].get_value(); + value_ = self.fields[fieldname].get_value(); } - var condition = fieldname + '=' + value; + var condition = fieldname + '=' + value_; - if (value) { + if (value_) { can_process_onchange = self.rpc({ url: '/web/dataset/call', async: false @@ -472,9 +472,9 @@ instance.web.FormView = instance.web.View.extend({ var field = this.fields[f]; // If field is not defined in the view, just ignore it if (field) { - var value = result.value[f]; - if (field.get_value() != value) { - field.set_value(value); + var value_ = result.value[f]; + if (field.get_value() != value_) { + field.set_value(value_); field.dirty = true; if (!_.contains(processed, field.name)) { this.do_onchange(field, processed); @@ -739,10 +739,10 @@ instance.web.FormView = instance.web.View.extend({ var values = {}; var ids = this.get_selected_ids(); values["id"] = ids.length > 0 ? ids[0] : false; - _.each(this.fields, function(value, key) { + _.each(this.fields, function(value_, key) { if (_.include(blacklist, key)) return; - var val = value.get_value(); + var val = value_.get_value(); values[key] = val; }); return values; @@ -759,8 +759,8 @@ instance.web.FormView = instance.web.View.extend({ }); }, is_dirty: function() { - return _.any(this.fields, function (value) { - return value.is_dirty(); + return _.any(this.fields, function (value_) { + return value_.is_dirty(); }); }, is_interactible_record: function() { @@ -781,10 +781,10 @@ instance.web.FormView = instance.web.View.extend({ var self = this; var fields = _.chain(this.fields) .map(function (field, name) { - var value = field.get_value(); + var value_ = field.get_value(); // ignore fields which are empty, invisible, readonly, o2m // or m2m - if (!value + if (!value_ || field.get('invisible') || field.get("readonly") || field.field.type === 'one2many' @@ -795,20 +795,20 @@ instance.web.FormView = instance.web.View.extend({ switch(field.field.type) { case 'selection': displayed = _(field.values).find(function (option) { - return option[0] === value; + return option[0] === value_; })[1]; break; case 'many2one': - displayed = field.value[1] || value; + displayed = value_; break; default: - displayed = value; + displayed = value_; } return { name: name, string: field.node_atts.string, - value: value, + value: value_, displayed: displayed, // convert undefined to false change_default: !!field.field.change_default @@ -857,12 +857,15 @@ instance.web.FormView = instance.web.View.extend({ this.fields[name] = field; this.fields_order.push(name); if (this.get_field(name).translate) { - translatable_fields.push(field); + this.translatable_fields.push(field); } }, get_field: function(field_name) { return this.fields_view.fields[field_name]; }, + is_create_mode: function() { + return !this.datarecord.id; + }, }); /** @@ -1262,7 +1265,7 @@ instance.web.form.compute_domain = function(expr, fields) { _t("Unknown field %s in domain %s"), ex[0], JSON.stringify(expr))); } - var field_value = field.get_value ? fields[ex[0]].get_value() : fields[ex[0]].value; + var field_value = field.get_value(); var op = ex[1]; var val = ex[2]; @@ -1563,6 +1566,10 @@ instance.web.form.FieldManagerInterface = { * Called by the field when the translate button is clicked. */ open_translate_dialog: function(field) {}, + /** + * Returns true when the view is in create mode. + */ + is_create_mode: function() {}, }; /** @@ -1599,7 +1606,7 @@ instance.web.form.FieldInterface = { * as well as any format commonly returned in a on_change. It must be able to autodetect those formats as * no information is ever given to know which format is used. */ - set_value: function(value) {}, + set_value: function(value_) {}, /** * Get the current value of the widget. * @@ -1645,7 +1652,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins this._super(field_manager, node); this.field_manager = field_manager; this.name = this.node.attrs.name; - this.value = false; + this.set({'value': false}); this.field = this.field_manager.get_field(this.name); this.set({required: this.modifiers['required'] === true}); this.invalid = this.dirty = false; @@ -1677,8 +1684,8 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins _.bind(set_required, this)(); } }, - set_value: function(value) { - this.value = value; + set_value: function(value_) { + this.set({'value': value_}); this.invalid = false; this.update_dom(); this.on_value_changed(); @@ -1692,7 +1699,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins this.field_manager.open_translate_dialog(this); }, get_value: function() { - return this.value; + return this.get('value'); }, is_valid: function() { return !this.invalid; @@ -1703,7 +1710,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins update_dom: function(show_invalid) { this._super.apply(this, arguments); if (this.field.translate) { - this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id); + this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode()); } if (!this.disable_utility_classes) { if (show_invalid) { @@ -1794,12 +1801,12 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({} initialize_content: function() { this.$element.find('input').change(this.on_ui_change); }, - set_value: function(value) { + set_value: function(value_) { this._super.apply(this, arguments); this.render_value(); }, render_value: function() { - var show_value = instance.web.format_value(this.value, this, ''); + var show_value = instance.web.format_value(this.get('value'), this, ''); if (!this.get("effective_readonly")) { this.$element.find('input').val(show_value); } else { @@ -1810,15 +1817,15 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({} } }, set_value_from_ui: function() { - this.value = instance.web.parse_value(this.$element.find('input').val(), this); + this.set('value', instance.web.parse_value(this.$element.find('input').val(), this)); this._super(); }, validate: function() { this.invalid = false; if (!this.get("effective_readonly")) { try { - var value = instance.web.parse_value(this.$element.find('input').val(), this, ''); - this.invalid = this.get("required") && value === ''; + var value_ = instance.web.parse_value(this.$element.find('input').val(), this, ''); + this.invalid = this.get("required") && value_ === ''; } catch(e) { this.invalid = true; } @@ -1844,15 +1851,15 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({ this._super(); } else { this.$element.find('a') - .attr('href', 'mailto:' + this.value) - .text(this.value); + .attr('href', 'mailto:' + this.get('value')) + .text(this.get('value')); } }, on_button_clicked: function() { - if (!this.value || !this.is_valid()) { + if (!this.get('value') || !this.is_valid()) { this.do_warn("E-mail error", "Can't send email to invalid e-mail address"); } else { - location.href = 'mailto:' + this.value; + location.href = 'mailto:' + this.get('value'); } } }); @@ -1867,19 +1874,19 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({ if (!this.get("effective_readonly")) { this._super(); } else { - var tmp = this.value; + var tmp = this.get('value'); var s = /(\w+):(.+)/.exec(tmp); if (!s) { - tmp = "http://" + this.value; + tmp = "http://" + this.get('value'); } this.$element.find('a').attr('href', tmp).text(tmp); } }, on_button_clicked: function() { - if (!this.value) { + if (!this.get('value')) { this.do_warn("Resource error", "This resource is empty"); } else { - var url = $.trim(this.value); + var url = $.trim(this.get('value')); if(/^www\./i.test(url)) url = 'http://'+url; window.open(url); @@ -1891,19 +1898,19 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ is_field_number: true, init: function (view, node) { this._super(view, node); - this.value = 0; + this.set({'value': 0}); if (this.node.attrs.digits) { this.digits = py.eval(node.attrs.digits); } else { this.digits = this.field.digits; } }, - set_value: function(value) { - if (value === false || value === undefined) { + set_value: function(value_) { + if (value_ === false || value_ === undefined) { // As in GTK client, floats default to 0 - value = 0; + value_ = 0; } - this._super.apply(this, [value]); + this._super.apply(this, [value_]); } }); @@ -1929,14 +1936,14 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({ }); this.$element.find('img.oe_datepicker_trigger').click(function() { if (!self.get("effective_readonly") && !self.picker('widget').is(':visible')) { - self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date()); + self.picker('setDate', self.get('value') ? instance.web.auto_str_to_date(self.get('value')) : new Date()); self.$input_picker.show(); self.picker('show'); self.$input_picker.hide(); } }); this.set_readonly(false); - this.value = false; + this.set({'value': false}); }, picker: function() { return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments); @@ -1945,16 +1952,16 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({ var date = this.picker('getDate'); this.$input.val(date ? this.format_client(date) : '').change(); }, - set_value: function(value) { - this.value = value; - this.$input.val(value ? this.format_client(value) : ''); + set_value: function(value_) { + this.set({'value': value_}); + this.$input.val(value_ ? this.format_client(value_) : ''); }, get_value: function() { - return this.value; + return this.get('value'); }, set_value_from_ui: function() { - var value = this.$input.val() || false; - this.value = this.parse_client(value); + var value_ = this.$input.val() || false; + this.set({'value': this.parse_client(value_)}); }, set_readonly: function(readonly) { this.readonly = readonly; @@ -1962,12 +1969,12 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({ this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly); }, is_valid: function() { - var value = this.$input.val(); - if (value === "") { + var value_ = this.$input.val(); + if (value_ === "") { return true; } else { try { - this.parse_client(value); + this.parse_client(value_); return true; } catch(e) { return false; @@ -2010,22 +2017,22 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten this.datewidget.appendTo(this.$element); } }, - set_value: function(value) { - this._super(value); + set_value: function(value_) { + this._super(value_); this.render_value(); }, render_value: function() { if (!this.get("effective_readonly")) { - this.datewidget.set_value(this.value); + this.datewidget.set_value(this.get('value')); } else { - this.$element.text(instance.web.format_value(this.value, this, '')); + this.$element.text(instance.web.format_value(this.get('value'), this, '')); } }, get_value: function() { if (!this.get("effective_readonly")) { return this.datewidget.get_value(); } else { - return this.value; + return this.get('value'); } }, validate: function() { @@ -2054,12 +2061,12 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({} this.resized = false; } }, - set_value: function(value) { + set_value: function(value_) { this._super.apply(this, arguments); this.render_value(); }, render_value: function() { - var show_value = instance.web.format_value(this.value, this, ''); + var show_value = instance.web.format_value(this.get('value'), this, ''); if (!this.get("effective_readonly")) { this.$textarea.val(show_value); if (!this.resized && this.view.options.resize_textareas) { @@ -2071,15 +2078,15 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({} } }, set_value_from_ui: function() { - this.value = instance.web.parse_value(this.$textarea.val(), this); + this.set({'value': instance.web.parse_value(this.$textarea.val(), this)}); this._super(); }, validate: function() { this.invalid = false; if (!this.get("effective_readonly")) { try { - var value = instance.web.parse_value(this.$textarea.val(), this, ''); - this.invalid = this.get("required") && value === ''; + var value_ = instance.web.parse_value(this.$textarea.val(), this, ''); + this.invalid = this.get("required") && value_ === ''; } catch(e) { this.invalid = true; } @@ -2125,12 +2132,12 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ this.on("change:effective_readonly", this, check_readonly); _.bind(check_readonly, this)(); }, - set_value: function(value) { + set_value: function(value_) { this._super.apply(this, arguments); - this.$checkbox[0].checked = value; + this.$checkbox[0].checked = value_; }, set_value_from_ui: function() { - this.value = this.$checkbox.is(':checked'); + this.set({value: this.$checkbox.is(':checked')}); this._super.apply(this, arguments); }, focus: function($element) { @@ -2143,13 +2150,13 @@ instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({ start: function() { this._super.apply(this, arguments); this.$element.progressbar({ - value: this.value, + value: this.get('value'), disabled: this.get("effective_readonly") }); }, - set_value: function(value) { + set_value: function(value_) { this._super.apply(this, arguments); - var show_value = Number(value); + var show_value = Number(value_); if (isNaN(show_value)) { show_value = 0; } @@ -2198,28 +2205,28 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte ischanging = false; }); }, - set_value: function(value) { - value = value === null ? false : value; - value = value instanceof Array ? value[0] : value; - this._super(value); + set_value: function(value_) { + value_ = value_ === null ? false : value_; + value_ = value_ instanceof Array ? value_[0] : value_; + this._super(value_); this.render_value(); }, render_value: function() { if (!this.get("effective_readonly")) { var index = 0; for (var i = 0, ii = this.values.length; i < ii; i++) { - if (this.values[i][0] === this.value) index = i; + if (this.values[i][0] === this.get('value')) index = i; } this.$element.find('select')[0].selectedIndex = index; } else { var self = this; var option = _(this.values) - .detect(function (record) { return record[0] === self.value; }); + .detect(function (record) { return record[0] === self.get('value'); }); this.$element.text(option ? option[1] : this.values[0][1]); } }, set_value_from_ui: function() { - this.value = this.values[this.$element.find('select')[0].selectedIndex][0]; + this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]}); this._super(); }, validate: function() { @@ -2227,8 +2234,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte this.invalid = false; return; } - var value = this.values[this.$element.find('select')[0].selectedIndex]; - this.invalid = !(value && !(this.get("required") && value[0] === false)); + var value_ = this.values[this.$element.find('select')[0].selectedIndex]; + this.invalid = !(value_ && !(this.get("required") && value_[0] === false)); }, focus: function($element) { this._super($element || this.$element.find('select:first')); @@ -2242,8 +2249,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte function filter( array, term ) { var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" ); - return $.grep( array, function(value) { - return matcher.test( $( "