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

Merge branch 'master' into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2013-07-03 15:34:27 +02:00
commit 136f8f76e0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
organize/stateful/browser.py
View file

@ -156,7 +156,6 @@ class ChangeState(EditObject, ChangeStateBase):
self.stateful.doTransition(self.action) self.stateful.doTransition(self.action)
notify(ObjectModifiedEvent(self.view.virtualTargetObject, notify(ObjectModifiedEvent(self.view.virtualTargetObject,
dict(transition=self.action, comments=comments))) dict(transition=self.action, comments=comments)))
#Attributes(IStateful, 'state', 'comments')))
return True return True

7
organize/tracking/change.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2008 Helmut Merz helmutm@cy55.de # Copyright (c) 2013 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
@ -18,8 +18,6 @@
""" """
Recording changes to loops objects. Recording changes to loops objects.
$Id$
""" """
from zope.app.container.interfaces import IObjectAddedEvent, IObjectRemovedEvent from zope.app.container.interfaces import IObjectAddedEvent, IObjectRemovedEvent
@ -53,6 +51,9 @@ class ChangeManager(BaseRecordManager):
@Lazy @Lazy
def valid(self): def valid(self):
req = util.getRequest()
if req and req.form.get('organize.suppress_tracking'):
return False
return (not (self.context is None or return (not (self.context is None or
self.storage is None or self.storage is None or
self.personId is None) self.personId is None)