From 67f9b7af98cb74acd651f164c01cd7c8d5a0b5a9 Mon Sep 17 00:00:00 2001 From: helmutm Date: Sat, 6 Dec 2008 11:44:11 +0000 Subject: [PATCH] correct handling of modification after creation git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3039 fd906abe-77d9-0310-91a1-e0d9ade77398 --- organize/tracking/report.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/organize/tracking/report.py b/organize/tracking/report.py index b5d59ea..78a269c 100644 --- a/organize/tracking/report.py +++ b/organize/tracking/report.py @@ -132,18 +132,21 @@ class RecentChanges(TrackingStats): result = [] for track in self.changeRecords: if track.data['action'] == 'add' and track.taskId not in new: + sameChanged = changed.get(track.taskId) + if sameChanged and sameChanged.timeStamp < track.timeStamp + 60: + # change immediate after creation + if result[-1].taskId == track.taskId: + result.pop() new[track.taskId] = track result.append(track) continue if track.data['action'] == 'modify' and track.taskId not in changed: - sameNew = new.get(track.taskId) - if sameNew and sameNew.timeStamp > track.timeStamp - 60: - # change immediate after creation - continue changed[track.taskId] = track result.append(track) continue - return dict(data=[TrackDetails(self, tr) for tr in result[:length]], + if len(resul) > length: + break + return dict(data=[TrackDetails(self, tr) for tr in result], macro=self.macros['recent_changes'])