[CMF-checkins] CVS: CMF - DefaultWorkflow.py:1.5 MembershipTool.py:1.9

shane@digicool.com shane@digicool.com
Mon, 11 Jun 2001 15:07:28 -0400 (EDT)


Update of /cvs-repository/CMF/CMFDefault
In directory korak.digicool.com:/tmp/cvs-serv29260

Modified Files:
	DefaultWorkflow.py MembershipTool.py 
Log Message:
- Member folders no longer have special role mappings.

- The default workflow is more explicit about allowing owners to view their
own content.



--- Updated File DefaultWorkflow.py in package CMF --
--- DefaultWorkflow.py	2001/06/08 15:07:22	1.4
+++ DefaultWorkflow.py	2001/06/11 19:07:27	1.5
@@ -376,9 +376,11 @@
             reviewer_view = 1
         # Modify role to permission mappings directly.
 
-        modifyPermissionMappings(ob,
+        return modifyPermissionMappings(ob,
             {'View': {'Anonymous': anon_view,
-                      'Reviewer': reviewer_view},
+                      'Reviewer': reviewer_view,
+                      'Owner': 1,
+                      },
              'Modify portal content': {'Owner': owner_modify}})
 
 Globals.InitializeClass(DefaultWorkflowDefinition)

--- Updated File MembershipTool.py in package CMF --
--- MembershipTool.py	2001/06/08 19:29:50	1.8
+++ MembershipTool.py	2001/06/11 19:07:27	1.9
@@ -173,15 +173,9 @@
             members.manage_addPortalFolder(member_id)
             f=getattr(members, member_id)
  
-            f.manage_permission(View,
-                                ['Owner','Manager','Reviewer'], 0)
-            f.manage_permission(AccessContentsInformation,
-                                ['Owner','Manager','Reviewer'], 0)
- 
             # Grant ownership to Member
             user = self.__getPUS().getUser(member_id)
-            try: f.changeOwnership(user)
-            except AttributeError: pass  # Zope 2.1.x compatibility
+            f.changeOwnership(user)
             f.manage_setLocalRoles(member_id, ['Owner'])
  
             # Create Member's home page.