[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py - re-synced createMemberArea with CMFDefault version
Yvo Schubbe
y.2011 at wcm-solutions.de
Wed Feb 23 05:38:45 EST 2011
Log message for revision 120531:
- re-synced createMemberArea with CMFDefault version
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2011-02-23 10:35:01 UTC (rev 120530)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2011-02-23 10:38:45 UTC (rev 120531)
@@ -122,22 +122,15 @@
return None
if self.isAnonymousUser():
return None
- # Note: We can't use getAuthenticatedMember() and getMemberById()
- # because they might be wrapped by MemberDataTool.
- user = getSecurityManager().getUser()
- user_id = user.getId()
- if member_id in ('', user_id):
- member = user
- member_id = user_id
- else:
- if _checkPermission(ManageUsers, self):
- member = self.acl_users.getUserById(member_id, None)
- if member:
- member = member.__of__(self.acl_users)
- else:
- raise ValueError, 'Member %s does not exist' % member_id
- else:
+ if member_id:
+ if not self.isMemberAccessAllowed(member_id):
return None
+ member = self.getMemberById(member_id)
+ if member is None:
+ return None
+ else:
+ member = self.getAuthenticatedMember()
+ member_id = member.getId()
if hasattr( aq_base(members), member_id ):
return None
More information about the checkins
mailing list