[REV] view_form: statusbar widget: indentation issue + reverted some more changes

bzr revid: tde@openerp.com-20131104120324-2h2j6huhgwc134c9
This commit is contained in:
Thibault Delavallée
2013-11-04 13:03:24 +01:00
parent 4c460dfa4e
commit 0ff21fc5e8
+9 -9
View File
@@ -5527,15 +5527,15 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
.read_slice(_.union(_.keys(self.distant_fields), ['id']), {}).then(function (records) {
var ids = _.pluck(records, 'id');
return self.dataset.name_get(ids).then(function (records_name) {
_.each(records, function (record) {
var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
if (record.fold && record.id != self.get('value')) {
selection_folded.push([record.id, name]);
} else {
selection_unfolded.push([record.id, name]);
}
});
_.each(records, function (record) {
var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
if (record.fold && record.id != self.get('value')) {
selection_folded.push([record.id, name]);
} else {
selection_unfolded.push([record.id, name]);
}
});
});
});
} else {
// For field type selection filter values according to
@@ -5566,7 +5566,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
if (this.distant_fields) {
return $.when(this.distant_fields);
}
return new instance.web.Model(self.field.relation).call("fields_get", [["bar_fold", "bar_color"]]).then(function(fields) {
return new instance.web.Model(self.field.relation).call("fields_get", [["fold"]]).then(function(fields) {
self.distant_fields = fields;
return fields;
});