[CMF-checkins] CVS: CMF/CMFCollector - Collector.py:1.38

Ken Manheimer klm@zope.com
Thu, 7 Nov 2002 09:39:29 -0500


Update of /cvs-repository/CMF/CMFCollector
In directory cvs.zope.org:/tmp/cvs-serv16286

Modified Files:
	Collector.py 
Log Message:
Properly qualified the reference to AddPortalContent permission, so it
now works.  Tested to affirm permission settings are as expected...


=== CMF/CMFCollector/Collector.py 1.37 => 1.38 ===
--- CMF/CMFCollector/Collector.py:1.37	Thu Nov  7 08:00:57 2002
+++ CMF/CMFCollector/Collector.py	Thu Nov  7 09:39:29 2002
@@ -385,7 +385,7 @@
                                roles=target_roles,
                                acquire=1)
         # Adjust who can add "attachments":
-        self.manage_permission(AddPortalContent,
+        self.manage_permission(CMFCorePermissions.AddPortalContent,
                                roles=target_roles,
                                acquire=1)
 
@@ -414,7 +414,8 @@
             # Ensure the issue acquires AddCollectorIssueFollowup
             # and AddPortalContent permissions.
             for m in i.ac_inherited_permissions(1):
-                if m[0] in [AddCollectorIssueFollowup, AddPortalContent]:
+                if m[0] in [AddCollectorIssueFollowup,
+                            CMFCorePermissions.AddPortalContent]:
                     perm = Permission.Permission(m[0], m[1], i)
                     roles = perm.getRoles()
                     if type(roles) == type(()):
@@ -542,7 +543,7 @@
     it.manage_permission(AddCollectorIssueFollowup,
                          roles=['Reviewer', 'Manager', 'Owner'],
                          acquire=1)
-    it.manage_permission(AddPortalContent,
+    it.manage_permission(CMFCorePermissions.AddPortalContent,
                          roles=['Reviewer', 'Manager', 'Owner'],
                          acquire=1)
     it.manage_permission(CMFCorePermissions.AccessInactivePortalContent,