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

handle deleted tasks gracefully

Browse source
This commit is contained in:
Helmut Merz 2014-05-26 10:17:39 +02:00
parent 49b7ef0382
commit 5f81ecfed2
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
organize/party.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2013 Helmut Merz helmutm@cy55.de # Copyright (c) 2014 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -56,6 +56,8 @@ PredicateInterfaceSourceList.predicateInterfaces += (IHasRole,)
def getPersonForUser(context, request=None, principal=None): def getPersonForUser(context, request=None, principal=None):
if context is None:
return None
if principal is None: if principal is None:
principal = getattr(request, 'principal', None) principal = getattr(request, 'principal', None)
if principal is None: if principal is None:

5
organize/tracking/report.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2008 Helmut Merz helmutm@cy55.de # Copyright (c) 2014 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -264,6 +264,9 @@ class TrackDetails(BaseView):
@Lazy @Lazy
def objectData(self): def objectData(self):
obj = self.object obj = self.object
if obj is None:
return dict(object=None, title='-', type='-', url='',
version=None, canAccess=False)
node = self.view.nodeView node = self.view.nodeView
url = node is not None and node.getUrlForTarget(obj) or '' url = node is not None and node.getUrlForTarget(obj) or ''
view = self.view.getViewForObject(obj) view = self.view.getViewForObject(obj)

3
organize/work/browser.py
View file

@ -170,6 +170,9 @@ class WorkItemDetails(TrackDetails):
@Lazy @Lazy
def allowedToEditWorkItem(self): def allowedToEditWorkItem(self):
#if checkPermission('loops.ManageSite', self.object): #if checkPermission('loops.ManageSite', self.object):
if (self.object is None and
checkPermission('zope.ManageContent', self.view.node)):
return True
if checkPermission('zope.ManageContent', self.object): if checkPermission('zope.ManageContent', self.object):
return True return True
return self.user['object'] == getPersonForUser(self.object, self.view.request) return self.user['object'] == getPersonForUser(self.object, self.view.request)

5
organize/work/work_macros.pt
View file

@ -36,8 +36,9 @@
<td class="nowrap center" tal:content="row/end">20:00</td> <td class="nowrap center" tal:content="row/end">20:00</td>
<td class="nowrap center" tal:content="row/duration">2:30</td> <td class="nowrap center" tal:content="row/duration">2:30</td>
<td tal:condition="python: 'Task' in work.columns"> <td tal:condition="python: 'Task' in work.columns">
<a tal:attributes="href row/objectData/url" <a tal:define="data row/objectData"
tal:content="row/objectData/title">Task</a></td> tal:attributes="href data/url"
tal:content="data/title">Task</a></td>
<td tal:condition="python: 'User' in work.columns"> <td tal:condition="python: 'User' in work.columns">
<a tal:attributes="href row/user/url" <a tal:attributes="href row/user/url"
tal:content="row/user/title">John</a></td> tal:content="row/user/title">John</a></td>