diff --git a/addons/web/static/src/js/views/basic/basic_view.js b/addons/web/static/src/js/views/basic/basic_view.js index 1601cf4c350..947a3ad26b6 100644 --- a/addons/web/static/src/js/views/basic/basic_view.js +++ b/addons/web/static/src/js/views/basic/basic_view.js @@ -53,9 +53,9 @@ var BasicView = AbstractView.extend({ var result = this._processFieldsView(arch, fields); var fieldAttrs = result.fieldAttrs; - var view_fields = result.view_fields; - var fieldNames = _.keys(view_fields); - fields = _.defaults(view_fields, fields); + var viewFields = result.view_fields; + var fieldNames = _.keys(viewFields); + fields = _.defaults(viewFields, fields); var self = this; // process the inner fields_view as well to find the fields they use. // register those fields' description directly on the view. @@ -63,12 +63,12 @@ var BasicView = AbstractView.extend({ // basically the field_names will be the keys of the fields obj. // don't use _ to iterate on fields in case there is a 'length' field, // as _ doesn't behave correctly when there is a length key in the object - for (var field_name in fields) { - var field = fields[field_name]; - _.each(field.views, function (inner_fields_view) { - result = self._processFieldsView(inner_fields_view.arch, inner_fields_view.fields); - inner_fields_view.fieldAttrs = result.fieldAttrs; - inner_fields_view.fields = result.view_fields; + for (var fieldName in fields) { + var field = fields[fieldName]; + _.each(field.views, function (innerFieldsView) { + result = self._processFieldsView(innerFieldsView.arch, innerFieldsView.fields); + innerFieldsView.fieldAttrs = result.fieldAttrs; + innerFieldsView.fields = result.view_fields; }); if (field.type === 'one2many' || field.type === 'many2many') { if (field.views && field.views.tree) { @@ -114,7 +114,7 @@ var BasicView = AbstractView.extend({ */ _processFieldsView: function (arch, fields) { var self = this; - var view_fields = Object.create(null); + var viewFields = Object.create(null); var fieldAttrs = Object.create(null); traverse(arch, function (node) { if (typeof node === 'string') { @@ -124,14 +124,14 @@ var BasicView = AbstractView.extend({ var attrs = node.attrs || {}; var field = _.extend({}, fields[node.attrs.name]); self._processField(field, node, attrs); - view_fields[node.attrs.name] = field; + viewFields[node.attrs.name] = field; fieldAttrs[node.attrs.name] = attrs; return false; } return node.tag !== 'arch'; }); return { - view_fields: view_fields, + view_fields: viewFields, fieldAttrs: fieldAttrs, }; }, diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js index 16ba9999ed0..55fce621a7c 100644 --- a/addons/web/static/src/js/views/calendar/calendar_model.js +++ b/addons/web/static/src/js/views/calendar/calendar_model.js @@ -331,7 +331,7 @@ return AbstractModel.extend({ */ _getFullCalendarOptions: function () { return { - defaultView: (this.mode == "month")? "month" : ((this.mode === "week")? "agendaWeek" : ((this.mode === "day")? "agendaDay" : "agendaWeek")), + defaultView: (this.mode === "month")? "month" : ((this.mode === "week")? "agendaWeek" : ((this.mode === "day")? "agendaDay" : "agendaWeek")), header: false, selectable: this.editable && this.create_right, selectHelper: true, diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js index d1badda7993..c1824223849 100644 --- a/addons/web/static/src/js/views/form/form_controller.js +++ b/addons/web/static/src/js/views/form/form_controller.js @@ -179,19 +179,18 @@ var FormController = BasicController.extend({ options = options || {}; var stayInEdit = 'stayInEdit' in options ? options.stayInEdit : false; var shouldReload = 'reload' in options ? options.reload : true; - var db_id = this.handle; - if (!this.model.isDirty(db_id) && !this.model.isNew(db_id)) { + if (!this.model.isDirty(this.handle) && !this.model.isNew(this.handle)) { if (!stayInEdit) { this._toReadOnlyMode(); } return $.Deferred().resolve(); } else { - var invalid_fields = this.renderer.checkInvalidFields(); - if (invalid_fields.length) { - this._notifyInvalidFields(invalid_fields); + var invalidFields = this.renderer.checkInvalidFields(); + if (invalidFields.length) { + this._notifyInvalidFields(invalidFields); return $.Deferred().reject(); } else { - return this.model.save(db_id, {reload: shouldReload}) + return this.model.save(this.handle, {reload: shouldReload}) .then(function (element) { if (!stayInEdit) { self._toReadOnlyMode(); @@ -229,8 +228,7 @@ var FormController = BasicController.extend({ _callButtonAction: function (attrs, record) { var self = this; var def = $.Deferred(); - var db_id = this.handle; - record = record || this.model.get(db_id); + record = record || this.model.get(this.handle); var recordID = record.data.id; this.trigger_up('execute_action', { action_data: _.extend({}, attrs, { diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js index 91887d45b5d..525e5a6da31 100644 --- a/addons/web/static/src/js/views/form/form_renderer.js +++ b/addons/web/static/src/js/views/form/form_renderer.js @@ -311,14 +311,14 @@ return BasicRenderer.extend({ }, _renderInnerField: function (node) { var field = this.state.fields[node.attrs.name]; - var field_descr = node.attrs.string || field.string; + var fieldDescr = node.attrs.string || field.string; var hasLabel = !node.attrs.nolabel; var widget = this._renderFieldWidget(node); if (hasLabel) { var $label = $('