[CMF-checkins] CVS: CMF/CMFDefault - DefaultWorkflow.py:1.14 Document.py:1.52 DublinCore.py:1.23 MembershipTool.py:1.27

[Chris McDonough]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv16445/CMFDefault

Modified Files:
	DefaultWorkflow.py Document.py DublinCore.py MembershipTool.py 
Log Message:
    - Multimodule checkin to convert calls from user.getUserName() to
      user.getId() where appropriate.  User names should not be used
      as immutable references, while user ids should.  The distinction
      is not clearly enforcd in the stock user folder or any current user
      folder implementations, but newer user folder implementations
      will rely upon it.



=== CMF/CMFDefault/DefaultWorkflow.py 1.13 => 1.14 ===
--- CMF/CMFDefault/DefaultWorkflow.py:1.13	Sun Jul 21 20:01:56 2002
+++ CMF/CMFDefault/DefaultWorkflow.py	Thu Oct 17 15:38:35 2002
@@ -83,7 +83,7 @@
         content_url = info.content_url
         content_creator = content.Creator()
         pm = getToolByName(self, 'portal_membership')
-        current_user = pm.getAuthenticatedMember().getUserName()
+        current_user = pm.getAuthenticatedMember().getId()
         review_state = self.getReviewStateOf(content)
         actions = []
 
@@ -185,7 +185,7 @@
                 raise 'Unauthorized', 'Already private'
             content_creator = ob.Creator()
             pm = getToolByName(self, 'portal_membership')
-            current_user = pm.getAuthenticatedMember().getUserName()
+            current_user = pm.getAuthenticatedMember().getId()
             if (content_creator != current_user) and not allow_review:
                 raise 'Unauthorized', 'Not creator or reviewer'
             self.setReviewStateOf(ob, 'private', action, comment)
@@ -232,7 +232,7 @@
     def setReviewStateOf(self, ob, review_state, action, comment):
         tool = aq_parent(aq_inner(self))
         pm = getToolByName(self, 'portal_membership')
-        current_user = pm.getAuthenticatedMember().getUserName()
+        current_user = pm.getAuthenticatedMember().getId()
         status = {
             'actor': current_user,
             'action': action,


=== CMF/CMFDefault/Document.py 1.51 => 1.52 ===
--- CMF/CMFDefault/Document.py:1.51	Sat Aug  3 23:51:56 2002
+++ CMF/CMFDefault/Document.py	Thu Oct 17 15:38:35 2002
@@ -246,7 +246,7 @@
            edit is the same as the last editor."""
 
         this_belt = safety_belt
-        this_user = getSecurityManager().getUser().getUserName()
+        this_user = getSecurityManager().getUser().getId()
 
         if (# we have a safety belt value:
             this_belt


=== CMF/CMFDefault/DublinCore.py 1.22 => 1.23 ===
--- CMF/CMFDefault/DublinCore.py:1.22	Sat Aug  3 22:31:31 2002
+++ CMF/CMFDefault/DublinCore.py	Thu Oct 17 15:38:35 2002
@@ -102,8 +102,8 @@
         #       *all* owners
         "Dublin Core element - resource creator"
         owner = self.getOwner()
-        if hasattr( owner, 'getUserName' ):
-            return owner.getUserName()
+        if hasattr( owner, 'getId' ):
+            return owner.getId()
         return 'No owner'
 
     security.declarePublic( 'Subject' )


=== CMF/CMFDefault/MembershipTool.py 1.26 => 1.27 ===
--- CMF/CMFDefault/MembershipTool.py:1.26	Mon Jul  8 12:47:41 2002
+++ CMF/CMFDefault/MembershipTool.py	Thu Oct 17 15:38:35 2002
@@ -138,7 +138,7 @@
         roster = []
         for member in self.listMembers():
             if isManager or member.listed:
-                roster.append({'id':member.getUserName(),
+                roster.append({'id':member.getId(),
                                'listed':member.listed})
         return roster
 
@@ -165,7 +165,7 @@
                 from AccessControl import getSecurityManager
                 user= getSecurityManager().getUser()
                 # check that we do not do something wrong
-                if user.getUserName() != member_id:
+                if user.getId() != member_id:
                     raise NotImplementedError, \
                         'cannot get user for member area creation'