[IMP] remove unneeded/redundant 'switch' cases, rename variable (remove unneeded trailing underscore)
bzr revid: xmo@openerp.com-20120522141649-e87xncspejpq3tgi
This commit is contained in:
parent
79c79e1d17
commit
09bc1b0d38
|
@ -794,34 +794,29 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
|
||||||
var self = this;
|
var self = this;
|
||||||
var fields = _.chain(this.fields)
|
var fields = _.chain(this.fields)
|
||||||
.map(function (field, name) {
|
.map(function (field, name) {
|
||||||
var value_ = field.get_value();
|
var value = field.get_value();
|
||||||
// ignore fields which are empty, invisible, readonly, o2m
|
// ignore fields which are empty, invisible, readonly, o2m
|
||||||
// or m2m
|
// or m2m
|
||||||
if (!value_
|
if (!value
|
||||||
|| field.get('invisible')
|
|| field.get('invisible')
|
||||||
|| field.get("readonly")
|
|| field.get("readonly")
|
||||||
|| field.field.type === 'one2many'
|
|| field.field.type === 'one2many'
|
||||||
|| field.field.type === 'many2many') {
|
|| field.field.type === 'many2many') {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var displayed;
|
var displayed = value;
|
||||||
switch(field.field.type) {
|
switch (field.field.type) {
|
||||||
case 'selection':
|
case 'selection':
|
||||||
displayed = _(field.values).find(function (option) {
|
displayed = _(field.values).find(function (option) {
|
||||||
return option[0] === value_;
|
return option[0] === value;
|
||||||
})[1];
|
})[1];
|
||||||
break;
|
break;
|
||||||
case 'many2one':
|
|
||||||
displayed = value_;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
displayed = value_;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name: name,
|
name: name,
|
||||||
string: field.node.attrs.string || field.field.string,
|
string: field.node.attrs.string || field.field.string,
|
||||||
value: value_,
|
value: value,
|
||||||
displayed: displayed,
|
displayed: displayed,
|
||||||
// convert undefined to false
|
// convert undefined to false
|
||||||
change_default: !!field.field.change_default
|
change_default: !!field.field.change_default
|
||||||
|
|
Loading…
Reference in New Issue