[CMF-checkins] CVS: Products/CMFCore - ActionProviderBase.py:1.34
DiscussionTool.py:1.21 TypesTool.py:1.91 WorkflowTool.py:1.55
Yvo Schubbe
y.2005- at wcm-solutions.de
Mon Jun 20 13:19:57 EDT 2005
Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv888/CMFCore
Modified Files:
ActionProviderBase.py DiscussionTool.py TypesTool.py
WorkflowTool.py
Log Message:
- removed redundant 'context' argument from _getOAI and _getExprContext
- import and whitespace cleanup
=== Products/CMFCore/ActionProviderBase.py 1.33 => 1.34 ===
--- Products/CMFCore/ActionProviderBase.py:1.33 Mon Jun 20 05:24:17 2005
+++ Products/CMFCore/ActionProviderBase.py Mon Jun 20 13:19:57 2005
@@ -82,7 +82,7 @@
# List ActionInfo objects.
# (method is without docstring to disable publishing)
#
- ec = self._getExprContext(self, object)
+ ec = self._getExprContext(object)
actions = self.listActions(object=object)
actions = [ ActionInfo(action, ec) for action in actions ]
@@ -324,10 +324,10 @@
, visible=visible
)
- def _getOAI(self, context, object):
- return getOAI(context, object)
-
- def _getExprContext(self, context, object):
- return getExprContext(context, object)
+ def _getOAI(self, object):
+ return getOAI(self, object)
+
+ def _getExprContext(self, object):
+ return getExprContext(self, object)
InitializeClass(ActionProviderBase)
=== Products/CMFCore/DiscussionTool.py 1.20 => 1.21 ===
--- Products/CMFCore/DiscussionTool.py:1.20 Mon Jun 20 05:24:17 2005
+++ Products/CMFCore/DiscussionTool.py Mon Jun 20 13:19:57 2005
@@ -21,7 +21,6 @@
from AccessControl import ClassSecurityInfo
from ActionProviderBase import ActionProviderBase
-from ActionInformation import getOAI
from permissions import AccessContentsInformation
from permissions import ManagePortal
from permissions import ReplyToItem
@@ -160,7 +159,7 @@
def listActions(self, info=None, object=None):
# Return actions for reply and show replies
if object is not None or info is None:
- info = self._getOAI(self, object)
+ info = self._getOAI(object)
content = info.object
if content is None or not self.isDiscussionAllowedFor(content):
return ()
=== Products/CMFCore/TypesTool.py 1.90 => 1.91 ===
--- Products/CMFCore/TypesTool.py:1.90 Mon Jun 20 05:24:17 2005
+++ Products/CMFCore/TypesTool.py Mon Jun 20 13:19:57 2005
@@ -140,7 +140,7 @@
# _actions and convert them.
self._actions = actions
self._convertActions()
-
+
aliases = kw.get( 'aliases', _marker )
if aliases is _marker:
self._guessMethodAliases()
=== Products/CMFCore/WorkflowTool.py 1.54 => 1.55 ===
--- Products/CMFCore/WorkflowTool.py:1.54 Mon Jun 20 05:24:17 2005
+++ Products/CMFCore/WorkflowTool.py Mon Jun 20 13:19:57 2005
@@ -24,7 +24,6 @@
from Globals import PersistentMapping
from OFS.Folder import Folder
-from ActionInformation import getOAI
from ActionProviderBase import ActionProviderBase
from interfaces.portal_workflow import portal_workflow as IWorkflowTool
from permissions import ManagePortal
@@ -228,7 +227,7 @@
o Global actions are supplied by all workflows.
"""
if object is not None or info is None:
- info = self._getOAI(self, object)
+ info = self._getOAI(object)
chain = self.getChainFor(info.object)
did = {}
actions = []
More information about the CMF-checkins
mailing list