diff --git a/organize/tracking/README.txt b/organize/tracking/README.txt index 0c3c6ec..832c82e 100644 --- a/organize/tracking/README.txt +++ b/organize/tracking/README.txt @@ -166,8 +166,9 @@ Recent changes >>> data[0].timeStamp u'... ...:...' - >>> data[0].object - {'url': '', 'object': , 'title': 'Change Doc 001'} + >>> data[0].objectData + {'url': '', 'version': '', 'object': , + 'title': 'Change Doc 001'} >>> data[0].user {'url': '', 'object': , 'title': u'john'} >>> data[0].action diff --git a/organize/tracking/report.pt b/organize/tracking/report.pt index 99d7cee..98a2c17 100644 --- a/organize/tracking/report.pt +++ b/organize/tracking/report.pt @@ -35,23 +35,36 @@ + - - - - + + + + + + + + +
TitleV User Date/Time New
- - + + 1.1 + +
diff --git a/organize/tracking/report.py b/organize/tracking/report.py index ce13242..c97837d 100644 --- a/organize/tracking/report.py +++ b/organize/tracking/report.py @@ -36,6 +36,7 @@ from loops.browser.common import BaseView from loops.interfaces import IResource from loops import util from loops.util import _ +from loops.versioning.interfaces import IVersionable report_macros = ViewPageTemplateFile('report.pt') @@ -142,7 +143,7 @@ class RecentChanges(TrackingStats): 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 + # skip change immediate after creation if result[-1].taskId == track.taskId: result.pop() new[track.taskId] = track @@ -170,12 +171,16 @@ class TrackDetails(object): @Lazy def object(self): - obj = util.getObjectForUid(self.track.taskId) + return util.getObjectForUid(self.track.taskId) + + @Lazy + def objectData(self): + obj = self.object node = self.view.nodeView url = node is not None and node.getUrlForTarget(obj) or '' - if url: - url = url + '?version=this' - return dict(object=obj, title=obj.title, url=url) + versionable = IVersionable(self.object, None) + version = versionable is not None and versionable.versionId or '' + return dict(object=obj, title=obj.title, url=url, version=version) @Lazy def user(self):