Merge pull request #3645 from odoo-dev/8.0-fix2manyupdateonchanges-chs

[FIX] api: avoid to return all fields *2many in onchanges
This commit is contained in:
Raphael Collet 2014-11-25 12:42:36 +01:00
commit cd2a432362
4 changed files with 24 additions and 22 deletions

View File

@ -146,8 +146,7 @@ class TestOnChange(common.TransactionCase):
}), }),
(1, message.id, { (1, message.id, {
'name': "[%s] %s" % ("Foo", USER.name), 'name': "[%s] %s" % ("Foo", USER.name),
'body': BODY, # Note: size is computed because it was not provided beforehand
'author': USER.id,
'size': len(BODY), 'size': len(BODY),
}), }),
]) ])

View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2013 OpenERP (<http://www.openerp.com>). # Copyright (C) 2013-2014 OpenERP (<http://www.openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -717,7 +717,7 @@ class Environment(object):
self.cache = defaultdict(dict) # {field: {id: value, ...}, ...} self.cache = defaultdict(dict) # {field: {id: value, ...}, ...}
self.prefetch = defaultdict(set) # {model_name: set(id), ...} self.prefetch = defaultdict(set) # {model_name: set(id), ...}
self.computed = defaultdict(set) # {field: set(id), ...} self.computed = defaultdict(set) # {field: set(id), ...}
self.dirty = set() # set(record) self.dirty = defaultdict(set) # {record: set(field_name), ...}
self.all = envs self.all = envs
envs.add(self) envs.add(self)
return self return self

View File

@ -791,7 +791,7 @@ class Field(object):
if env.in_onchange: if env.in_onchange:
for invf in self.inverse_fields: for invf in self.inverse_fields:
invf._update(value, record) invf._update(value, record)
record._dirty = True record._set_dirty(self.name)
# determine more dependent fields, and invalidate them # determine more dependent fields, and invalidate them
if self.relational: if self.relational:
@ -1577,13 +1577,14 @@ class _RelationalMulti(_Relational):
# add new and existing records # add new and existing records
for record in value: for record in value:
if not record.id or record._dirty: if not record.id:
values = dict((k, v) for k, v in record._cache.iteritems() if k in fnames) values = {k: v for k, v in record._cache.iteritems() if k in fnames}
values = record._convert_to_write(values) values = record._convert_to_write(values)
if not record.id: result.append((0, 0, values))
result.append((0, 0, values)) elif record._is_dirty():
else: values = {k: record._cache[k] for k in record._get_dirty() if k in fnames}
result.append((1, record.id, values)) values = record._convert_to_write(values)
result.append((1, record.id, values))
else: else:
add_existing(record.id) add_existing(record.id)

View File

@ -5343,22 +5343,24 @@ class BaseModel(object):
return record return record
# #
# Dirty flag, to mark records modified (in draft mode) # Dirty flags, to mark record fields modified (in draft mode)
# #
@property def _is_dirty(self):
def _dirty(self):
""" Return whether any record in `self` is dirty. """ """ Return whether any record in `self` is dirty. """
dirty = self.env.dirty dirty = self.env.dirty
return any(record in dirty for record in self) return any(record in dirty for record in self)
@_dirty.setter def _get_dirty(self):
def _dirty(self, value): """ Return the list of field names for which `self` is dirty. """
""" Mark the records in `self` as dirty. """ dirty = self.env.dirty
if value: return list(dirty.get(self, ()))
map(self.env.dirty.add, self)
else: def _set_dirty(self, field_name):
map(self.env.dirty.discard, self) """ Mark the records in `self` as dirty for the given `field_name`. """
dirty = self.env.dirty
for record in self:
dirty[record].add(field_name)
# #
# "Dunder" methods # "Dunder" methods
@ -5760,7 +5762,7 @@ class BaseModel(object):
field = self._fields[name] field = self._fields[name]
newval = record[name] newval = record[name]
if field.type in ('one2many', 'many2many'): if field.type in ('one2many', 'many2many'):
if newval != oldval or newval._dirty: if newval != oldval or newval._is_dirty():
# put new value in result # put new value in result
result['value'][name] = field.convert_to_write( result['value'][name] = field.convert_to_write(
newval, record._origin, subfields.get(name), newval, record._origin, subfields.get(name),