From b70b52213717a3318d7550e4b03e878111f6448a Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 10 Oct 2015 10:38:31 +0200 Subject: [PATCH] work item list: show description of task as link title; fix docttests: changed handling of field defaults --- README.txt | 6 ++++-- external/README.txt | 8 ++++---- organize/tracking/README.txt | 8 ++++++-- organize/tracking/report.py | 9 ++++++--- organize/work/work_macros.pt | 7 ++++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/README.txt b/README.txt index 9da5ed7..4383987 100755 --- a/README.txt +++ b/README.txt @@ -737,7 +737,9 @@ on data provided in this form: >>> component.provideAdapter(NameChooser) >>> request = TestRequest(form={'title': u'Test Note', - ... 'form.type': u'.loops/concepts/note'}) + ... 'form.type': u'.loops/concepts/note', + ... 'contentType': u'text/restructured', + ... 'linkUrl': u'http://'}) >>> view = NodeView(m112, request) >>> cont = CreateObject(view, request) >>> cont.update() @@ -802,7 +804,7 @@ The new technique uses the ``fields`` and ``data`` attributes... linkText textline False None >>> view.data - {'linkUrl': u'http://', 'contentType': 'text/restructured', 'data': u'', + {'linkUrl': u'http://', 'contentType': u'text/restructured', 'data': u'', 'linkText': u'', 'title': u'Test Note'} The object is changed via a FormController adapter created for diff --git a/external/README.txt b/external/README.txt index 017ce46..1844a0b 100644 --- a/external/README.txt +++ b/external/README.txt @@ -136,7 +136,7 @@ Writing object information to the external storage concept(u'myquery', u'My Query', u'query', options=u'option1\noption2', viewName=u'mystuff.html'...)... child(u'projects', u'customer', u'standard')... - resource(u'doc04.txt', u'Document 4', u'textdocument', contentType='text/restructured')... + resource(u'doc04.txt', u'Document 4', u'textdocument', contentType=u'')... resourceRelation(u'myquery', u'doc04.txt', u'standard') node('home', u'Home', '', u'menu') node('myquery', u'My Query', 'home', u'page', target=u'concepts/myquery')... @@ -194,9 +194,9 @@ Extracting selected parts of the concept map concept(u'cust1', u'Customer 1', u'customer') concept(u'cust2', u'Customer 2', u'customer') concept(u'cust3', u'Customer 3', u'customer') - resource(u'd001.txt', u'Doc 001', u'textdocument', contentType='text/restructured') - resource(u'd003.txt', u'Doc 003', u'textdocument', contentType='text/restructured') - resource(u'd002.txt', u'Doc 002', u'textdocument', contentType='text/restructured') + resource(u'd001.txt', u'Doc 001', u'textdocument', contentType=u'') + resource(u'd003.txt', u'Doc 003', u'textdocument', contentType=u'') + resource(u'd002.txt', u'Doc 002', u'textdocument', contentType=u'') resourceRelation(u'cust1', u'd001.txt', u'standard') resourceRelation(u'cust1', u'd003.txt', u'standard') resourceRelation(u'cust3', u'd002.txt', u'standard') diff --git a/organize/tracking/README.txt b/organize/tracking/README.txt index 1aee1f4..4f2eaf0 100644 --- a/organize/tracking/README.txt +++ b/organize/tracking/README.txt @@ -177,11 +177,15 @@ Recent changes >>> data[0].timeStamp u'... ...:...' + >>> data[0].objectData - {'version': '', 'canAccess': True, 'title': 'Change Doc 001', 'url': '', - 'object': , 'type': u'Text'} + {'version': '', 'description': u'', 'title': 'Change Doc 001', 'url': '', + 'object': , 'type': u'Text', + 'canAccess': True} + >>> data[0].user {'url': '', 'object': , 'title': u'john'} + >>> data[0].action 'modify' diff --git a/organize/tracking/report.py b/organize/tracking/report.py index a019865..91b7012 100644 --- a/organize/tracking/report.py +++ b/organize/tracking/report.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2014 Helmut Merz helmutm@cy55.de +# Copyright (c) 2015 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -265,20 +265,23 @@ class TrackDetails(BaseView): def objectData(self): obj = self.object if obj is None: - return dict(object=None, title='-', type='-', url='', + return dict(object=None, title='-', description='', + type='-', url='', version=None, canAccess=False) node = self.view.nodeView url = node is not None and node.getUrlForTarget(obj) or '' view = self.view.getViewForObject(obj) if view is None: title = obj.title + desc = obj.description else: title = view.listingTitle + desc = view.description versionable = IVersionable(self.object, None) version = ((versionable is not None and not (versionable.notVersioned) and versionable.versionId) or '') - return dict(object=obj, title=title, + return dict(object=obj, title=title, description=desc, type=self.longTypeTitle, url=url, version=version, canAccess=canAccessObject(obj)) diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt index 03a1507..b83c75d 100644 --- a/organize/work/work_macros.pt +++ b/organize/work/work_macros.pt @@ -27,7 +27,7 @@ 17:30 20:00 2:30 - + Task