Skip to content

Commit

Permalink
[IMP] models: rework the API that deals with dirty fields on records
Browse files Browse the repository at this point in the history
  • Loading branch information
rco-odoo committed Nov 24, 2014
1 parent 999ed04 commit bc8c759
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
7 changes: 3 additions & 4 deletions openerp/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ def __set__(self, record, value):
if env.in_onchange:
for invf in self.inverse_fields:
invf._update(value, record)
record._set_dirty_by(self.name)
record._set_dirty(self.name)

# determine more dependent fields, and invalidate them
if self.relational:
Expand Down Expand Up @@ -1577,9 +1577,8 @@ def convert_to_write(self, value, target=None, fnames=None):

# add new and existing records
for record in value:
if not record.id or record._dirty:
dirty_fields = record.env.dirty[record]
values = dict((k, v) for k, v in record._cache.iteritems() if k in fnames and k in dirty_fields)
if not record.id or record._is_dirty():
values = {k: record._cache[k] for k in record._get_dirty() if k in fnames}
values = record._convert_to_write(values)
if not record.id:
result.append((0, 0, values))
Expand Down
17 changes: 11 additions & 6 deletions openerp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5313,16 +5313,21 @@ def new(self, values={}):
return record

#
# Dirty flag, to mark records modified (in draft mode)
# Dirty flags, to mark record fields modified (in draft mode)
#

@property
def _dirty(self):
def _is_dirty(self):
""" Return whether any record in `self` is dirty. """
dirty = self.env.dirty
return any(bool(dirty.get(record)) for record in self)
return any(record in dirty for record in self)

def _get_dirty(self):
""" Return the list of field names for which `self` is dirty. """
dirty = self.env.dirty
return list(dirty.get(self, ()))

def _set_dirty_by(self, field_name):
def _set_dirty(self, field_name):
""" 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)
Expand Down Expand Up @@ -5727,7 +5732,7 @@ def onchange(self, values, field_name, field_onchange):
field = self._fields[name]
newval = record[name]
if field.type in ('one2many', 'many2many'):
if newval != oldval or newval._dirty:
if newval != oldval or newval._is_dirty():
# put new value in result
result['value'][name] = field.convert_to_write(
newval, record._origin, subfields.get(name),
Expand Down

0 comments on commit bc8c759

Please sign in to comment.