cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

always track state changes; allow control of change tracking via 'force' parameter

Browse source
This commit is contained in:
Helmut Merz 2014-11-03 10:32:51 +01:00
parent 13f80f2093
commit ff23ddf90a
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
organize/tracking/change.py
View file

@ -52,11 +52,16 @@ class ChangeManager(BaseRecordManager):
@Lazy @Lazy
def valid(self): def valid(self):
return self.isValid()
def isValid(self, data={}, **kw):
req = util.getRequest() req = util.getRequest()
if req and req.form.get('organize.suppress_tracking'): if req and req.form.get('organize.suppress_tracking'):
return False return False
if self.context is None or self.storage is None or self.personId is None: if self.context is None or self.storage is None or self.personId is None:
return False return False
if kw.get('force') or data.get('transition'):
return True
opt = self.options('organize.tracking.changes') opt = self.options('organize.tracking.changes')
if isinstance(opt, (list, tuple)): if isinstance(opt, (list, tuple)):
if hasattr(self.context, 'getType'): if hasattr(self.context, 'getType'):
@ -67,23 +72,23 @@ class ChangeManager(BaseRecordManager):
return bool(opt) return bool(opt)
def recordModification(self, action='modify', **kw): def recordModification(self, action='modify', **kw):
if not self.valid:
return
uid = util.getUidForObject(self.context)
last = self.storage.getLastUserTrack(uid, 0, self.personId)
update = (last is not None and last.data.get('action') == action and
last.metadata['timeStamp'] >= getTimeStamp() - 5)
data = dict(action=action) data = dict(action=action)
relation = kw.get('relation')
if relation is not None:
data['predicate'] = util.getUidForObject(relation.predicate)
data['second'] = util.getUidForObject(relation.second)
event = kw.get('event') event = kw.get('event')
if event is not None: if event is not None:
desc = getattr(event, 'descriptions', ()) desc = getattr(event, 'descriptions', ())
for item in desc: for item in desc:
if isinstance(item, dict): if isinstance(item, dict):
data.update(item) data.update(item)
if not self.isValid(data, **kw):
return
uid = util.getUidForObject(self.context)
last = self.storage.getLastUserTrack(uid, 0, self.personId)
update = (last is not None and last.data.get('action') == action and
last.metadata['timeStamp'] >= getTimeStamp() - 5)
relation = kw.get('relation')
if relation is not None:
data['predicate'] = util.getUidForObject(relation.predicate)
data['second'] = util.getUidForObject(relation.second)
if update: if update:
self.storage.updateTrack(last, data) self.storage.updateTrack(last, data)
else: else: