[CMF-checkins] CVS: Products/CMFCore - ActionInformation.py:1.22 ActionProviderBase.py:1.27

[Florent Guillaume]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv17554/CMFCore

Modified Files:
	ActionInformation.py ActionProviderBase.py 
Log Message:
Store an empty tuple for permissions if no permission is given (Collector #242).


=== Products/CMFCore/ActionInformation.py 1.21 => 1.22 ===
--- Products/CMFCore/ActionInformation.py:1.21	Wed Jun 30 11:40:17 2004
+++ Products/CMFCore/ActionInformation.py	Fri Jul 16 12:49:21 2004
@@ -91,6 +91,8 @@
                 condition = Expression(condition)
             self.condition = condition
         if permissions is not _unchanged:
+            if permissions == ('',):
+                permissions = ()
             self.permissions = permissions
         if priority is not _unchanged:
             self.priority = priority


=== Products/CMFCore/ActionProviderBase.py 1.26 => 1.27 ===
--- Products/CMFCore/ActionProviderBase.py:1.26	Wed Jun 30 17:57:46 2004
+++ Products/CMFCore/ActionProviderBase.py	Fri Jul 16 12:49:21 2004
@@ -197,7 +197,7 @@
         c_expr = condition and Expression(text=str(condition)) or ''
 
         if type( permission ) != type( () ):
-            permission = permission and (str(permission),) or ()
+            permission = (str(permission),)
 
         new_actions = self._cloneActions()