Migration de la classe MemberData vers adaptateur.

[Plinn.git] / MembershipTool.py

diff --git a/MembershipTool.py b/MembershipTool.py
index 29960e7..d60ed39 100755 (executable)
--- a/MembershipTool.py
+++ b/MembershipTool.py
@@ -19,8 +19,8 @@
 #######################################################################################
 """ Plinn portal_membership
 
 #######################################################################################
 """ Plinn portal_membership
 

-$Id: MembershipTool.py 1547 2010-01-05 16:24:22Z pin $
-$URL: http://svn.cri.ensmp.fr/svn/Plinn/branches/CMF-2.1/MembershipTool.py $
+
+

 """
 
 from AccessControl import ClassSecurityInfo, getSecurityManager
 """
 
 from AccessControl import ClassSecurityInfo, getSecurityManager


@@ -243,7 +243,7 @@ class MembershipTool( BaseTool ):
                                return userid
                        memberName = getattr(member, 'name', '')
                        memberGivenName = getattr(member, 'given_name', '')
                                return userid
                        memberName = getattr(member, 'name', '')
                        memberGivenName = getattr(member, 'given_name', '')

-                       memberId = member.id
+                       memberId = member.getId()

                        memberFullName = formatFullName(memberName, memberGivenName, memberId, nameBefore = nameBefore)
                        
                return memberFullName
                        memberFullName = formatFullName(memberName, memberGivenName, memberId, nameBefore = nameBefore)
                        
                return memberFullName


@@ -379,16 +379,15 @@ class MembershipTool( BaseTool ):
                ttool = getToolByName(self, 'portal_types')
                info = getattr(ttool, self.memberareaPortalType)
                
                ttool = getToolByName(self, 'portal_types')
                info = getattr(ttool, self.memberareaPortalType)
                

-               f = info._constructInstance( members, member_id )

                memberFullName = self.getMemberFullNameById(member_id, nameBefore = 0)
                memberFullName = self.getMemberFullNameById(member_id, nameBefore = 0)

+               f = info._constructInstance( members, member_id, title=memberFullName )

                
                # Grant Ownership and Owner role to Member
                f.changeOwnership(user)
                f.__ac_local_roles__ = None
                f.manage_setLocalRoles(member_id, ['Owner'])
 
                
                # Grant Ownership and Owner role to Member
                f.changeOwnership(user)
                f.__ac_local_roles__ = None
                f.manage_setLocalRoles(member_id, ['Owner'])
 

-               f.setTitle(memberFullName)
-               info._finishConstruction(f)
+               f.reindexObjectSecurity()

                
                # Create Member's initial content.
                if hasattr(self, 'createMemberContent') :
                
                # Create Member's initial content.
                if hasattr(self, 'createMemberContent') :