[CMF-checkins] CVS: CMF/CMFDefault - DefaultWorkflow.py:1.23
DiscussionTool.py:1.17
Yvo Schubbe
schubbe at web.de
Thu Jan 8 07:30:04 EST 2004
Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv15522/CMFDefault
Modified Files:
DefaultWorkflow.py DiscussionTool.py
Log Message:
- replaced Unauthorized strings by class exceptions
=== CMF/CMFDefault/DefaultWorkflow.py 1.22 => 1.23 ===
--- CMF/CMFDefault/DefaultWorkflow.py:1.22 Sun Jan 4 11:48:34 2004
+++ CMF/CMFDefault/DefaultWorkflow.py Thu Jan 8 07:29:33 2004
@@ -20,19 +20,19 @@
from DateTime import DateTime
from Globals import InitializeClass
+from Products.CMFCore.CMFCoreExceptions import AccessControl_Unauthorized
from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
from Products.CMFCore.CMFCorePermissions import RequestReview
from Products.CMFCore.CMFCorePermissions import ReviewPortalContent
from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.utils import _modifyPermissionMappings
+from Products.CMFCore.interfaces.portal_workflow \
+ import WorkflowDefinition as IWorkflowDefinition
from Products.CMFCore.utils import _checkPermission
+from Products.CMFCore.utils import _modifyPermissionMappings
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import SimpleItemWithProperties
from Products.CMFCore.WorkflowTool import addWorkflowClass
-from Products.CMFCore.interfaces.portal_workflow \
- import WorkflowDefinition as IWorkflowDefinition
-
class DefaultWorkflowDefinition (SimpleItemWithProperties):
""" Default workflow definition.
@@ -184,31 +184,31 @@
if action == 'submit':
if not allow_request:
- raise 'Unauthorized', 'Not authorized'
+ raise AccessControl_Unauthorized('Not authorized')
elif review_state != 'private':
- raise 'Unauthorized', 'Already in submit state'
+ raise AccessControl_Unauthorized('Already in submit state')
self.setReviewStateOf(ob, 'pending', action, comment)
elif action == 'retract':
if not allow_request:
- raise 'Unauthorized', 'Not authorized'
+ raise AccessControl_Unauthorized('Not authorized')
elif review_state == 'private':
- raise 'Unauthorized', 'Already private'
+ raise AccessControl_Unauthorized('Already private')
content_creator = ob.Creator()
pm = getToolByName(self, 'portal_membership')
current_user = pm.getAuthenticatedMember().getId()
if (content_creator != current_user) and not allow_review:
- raise 'Unauthorized', 'Not creator or reviewer'
+ raise AccessControl_Unauthorized('Not creator or reviewer')
self.setReviewStateOf(ob, 'private', action, comment)
elif action == 'publish':
if not allow_review:
- raise 'Unauthorized', 'Not authorized'
+ raise AccessControl_Unauthorized('Not authorized')
self.setReviewStateOf(ob, 'published', action, comment)
elif action == 'reject':
if not allow_review:
- raise 'Unauthorized', 'Not authorized'
+ raise AccessControl_Unauthorized('Not authorized')
self.setReviewStateOf(ob, 'private', action, comment)
security.declarePrivate('isInfoSupported')
=== CMF/CMFDefault/DiscussionTool.py 1.16 => 1.17 ===
--- CMF/CMFDefault/DiscussionTool.py:1.16 Sun Nov 23 11:29:04 2003
+++ CMF/CMFDefault/DiscussionTool.py Thu Jan 8 07:29:33 2004
@@ -19,19 +19,20 @@
from AccessControl import ClassSecurityInfo
from OFS.SimpleItem import SimpleItem
-from Products.CMFCore.utils import UniqueObject, getToolByName
+from Products.CMFCore.ActionInformation import ActionInformation
+from Products.CMFCore.ActionProviderBase import ActionProviderBase
+from Products.CMFCore.CMFCoreExceptions import AccessControl_Unauthorized
from Products.CMFCore.CMFCorePermissions import ManagePortal
from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
from Products.CMFCore.CMFCorePermissions import ReplyToItem
-
-from utils import _dtmldir
-from DiscussionItem import DiscussionItemContainer
-from Products.CMFCore.ActionInformation import ActionInformation
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.Expression import Expression
-
from Products.CMFCore.interfaces.portal_discussion \
import portal_discussion as IDiscussionTool
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import UniqueObject
+
+from DiscussionItem import DiscussionItemContainer
+from utils import _dtmldir
class DiscussionNotAllowed( Exception ):
@@ -82,7 +83,7 @@
"""
mtool = getToolByName( self, 'portal_membership' )
if not mtool.checkPermission(ModifyPortalContent, content):
- raise "Unauthorized"
+ raise AccessControl_Unauthorized
if allowDiscussion is None or allowDiscussion == 'None':
if hasattr(content, 'allow_discussion'):
More information about the CMF-checkins
mailing list