summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-06-23 15:51:24 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-06-23 15:51:24 +0200
commit986eaa7c9ca66608e364a1ea5a1f20fcdce693da (patch)
tree2077cbf990ef266503be3cc3679bf5d78b3a0a32 /addons/base/static/src
parent7fc77495e047a5cd0588d6c92c01fc2ed9f041f0 (diff)
[fix] problem with ids not added to read_ids in o2m dataset
bzr revid: nicolas.vanhoren@openerp.com-20110623135124-8yvk56l18j9f6mwk
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/form.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9a9f9738a6a..4bb2e0ca636 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1280,7 +1280,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, []);
dataset.call("name_get", [value], function(data) {
real_set_value(data.result[0]);
- });
+ }).fail(function() {self.tmp_value = undefined;});
} else {
setTimeout(function() {real_set_value(value);}, 0);
}
@@ -1486,9 +1486,10 @@ openerp.base.form.One2ManyDataset = openerp.base.DataSetStatic.extend({
var return_records = function() {
var records = _.map(ids, function(id) {return _.detect(self.cache, function(c) {return c.id === id;}).values;});
// avoid giving fields that were not asked for (+ create a copy of the cache)
+ var fields_plus_id = fields.concat(["id"]);
records = _.map(records, function(record) {
var tmp = {};
- _.each(fields, function(field) {
+ _.each(fields_plus_id, function(field) {
tmp[field] = record[field];
});
return tmp;