From 09bc1b0d3854d77246e9aab94237cb0b4ecdf4c2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 22 May 2012 16:16:49 +0200 Subject: [PATCH] [IMP] remove unneeded/redundant 'switch' cases, rename variable (remove unneeded trailing underscore) bzr revid: xmo@openerp.com-20120522141649-e87xncspejpq3tgi --- addons/web/static/src/js/view_form.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3c55579df6f..3430f1dd703 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -794,34 +794,29 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form. 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' || field.field.type === 'many2many') { return false; } - var displayed; - switch(field.field.type) { + var displayed = value; + 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 = value_; - break; - default: - displayed = value_; } return { name: name, string: field.node.attrs.string || field.field.string, - value: value_, + value: value, displayed: displayed, // convert undefined to false change_default: !!field.field.change_default