[zopeorg-checkins] CVS: Products/ZopeOrg-NV - NewsItemWorkflow.py:1.7 ZopeOrgMemberDataTool.py:1.2 ZopeOrgMembershipTool.py:1.4 ZopeOrgWorkflow.py:1.12
Jens Vagelpohl
jens at zope.com
Mon Jun 10 16:45:42 EDT 2002
Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv25778
Modified Files:
NewsItemWorkflow.py ZopeOrgMemberDataTool.py
ZopeOrgMembershipTool.py ZopeOrgWorkflow.py
Log Message:
removing all references to points as well as the roster
=== Products/ZopeOrg-NV/NewsItemWorkflow.py 1.6 => 1.7 ===
self.setReviewStateOf(moved_obj, 'published', action, comment)
- # Give the member a cookie
- mem_tool.grantPoints( user_id=obj_creatorName
- , points=1
- )
-
fav_obj = Favorite( id=new_obj_id
, title=moved_obj.Title()
, remote_url=url_tool.getRelativeUrl(moved_obj)
=== Products/ZopeOrg-NV/ZopeOrgMemberDataTool.py 1.1 => 1.2 ===
- security.declarePrivate('grantPoints')
- def grantPoints( self, points=1 ):
- """ Grant membership points to this member """
- user_obj = self.getUser()
- user_dn = user_obj.getUserDN()
- acl_manager = self.acl_users
-
- acl_manager.manage_setUserProperty( user_dn = user_dn
- , prop_name = 'pointCount'
- , prop_value = str(points)
- )
- user_obj._expire()
-
-
- security.declarePrivate('setPointThreshold')
- def setPointThreshold( self, points ):
- """ Set an individual's point threshold """
- user_obj = self.getUser()
- user_dn = user_obj.getUserDN()
- acl_manager = self.acl_users
-
- acl_manager.manage_setUserProperty( user_dn = user_dn
- , prop_name = 'pointThreshold'
- , prop_value = str(points)
- )
- user_obj._expire()
-
-
security.declarePrivate('setLastLogin')
def setLastLogin( self ):
""" Reset my last login times """
=== Products/ZopeOrg-NV/ZopeOrgMembershipTool.py 1.3 => 1.4 ===
def __init__( self, id='portal_membership' ):
self.id = id
- self._point_threshold = 6
security.declarePublic( 'getSearchableAttributes' )
def getUserSearchableAttributes( self ):
""" get user attributes that are allowed for searching """
- excluded = ( 'lastLogin', 'pointCount', 'pointThreshold'
- , 'prevLogin', 'public', 'startupPage'
- , 'portalSkin', 'cn' )
+ excluded = ( 'lastLogin', 'prevLogin', 'public'
+ , 'startupPage', 'portalSkin', 'cn' )
attrs = list( self.acl_users.getLDAPSchema() )
deletables = []
@@ -68,7 +66,7 @@
return cmp( a[1], b[1] )
- def getRoster( self, search_param, search_term ):
+ def getRoster( self, search_param="cn", search_term='' ):
""" get the membership roster """
isManager = _checkPermission('Manage portal', self)
uf = self.acl_users
@@ -180,168 +178,6 @@
if member is not None:
member.setStartupPage( target_obj )
-
-
- security.declareProtected(ManagePortal, 'setDefaultPointThreshold')
- def setDefaultPointThreshold( self, point_count, REQUEST=None ):
- """ Set the number of points to become eligible for maintainer role """
- self._point_threshold = point_count
-
- if REQUEST is not None:
- return self.manage_mapRoles(self, REQUEST)
-
-
- security.declareProtected(ManagePortal, 'getDefaultPointThreshold')
- def getDefaultPointThreshold( self ):
- """ get the default invitation threshold """
- return self._point_threshold
-
-
- security.declareProtected(ManagePortal, 'setPointThreshold')
- def setPointThreshold( self, user_id, points=0 ):
- """ Set point threshold on an individual member basis """
- member = self.getMemberById( user_id )
- if points == 0:
- points = self._point_threshold
-
- if member is not None:
- member.setPointThreshold( points )
-
-
- security.declareProtected(AccessContentsInformation, 'getPointThreshold')
- def getPointThreshold( self, user_id ):
- """ Get the number of points to become eligible for maintainer role """
- member = self.getMemberById( user_id )
- cur_threshold = self._point_threshold
-
- if member is not None:
- default = self._point_threshold
- cur_threshold = member.getProperty('pointThreshold') or default
-
- return int(cur_threshold)
-
-
- security.declareProtected(ManagePortal, 'grantPoints')
- def grantPoints( self, user_id, points=1 ):
- """ Grant a membership point """
- member = self.getMemberById( user_id )
-
- if member is not None:
- cur_points = int(member.getProperty('pointCount') or 0)
- new_points = int(cur_points) + int(points)
-
- # Do we send an invite?
- member_threshold = self.getPointThreshold( user_id=user_id )
-
- if (member_threshold > cur_points and
- member_threshold <= new_points):
- self.inviteMaintainer( user_id=user_id
- , REQUEST=self.REQUEST
- )
-
- member.grantPoints( new_points )
-
-
- security.declareProtected(AccessContentsInformation, 'getPoints')
- def getPoints( self, user_id ):
- """ Get a member's point count """
- member = self.getMemberById( user_id )
- points = member.getProperty('pointCount') or 0
-
- return int(points)
-
-
- security.declareProtected(AnointMaintainer, 'disableMaintainership')
- def disableMaintainership( self, user_id ):
- """ Disable further maintainer invitations """
- member = self.getMemberById( user_id )
- role_list = list( member.getRoles() )
- cur_user = self.getAuthenticatedMember()
- can_disable = (cur_user.has_permission('Manage portal', self) or
- cur_user.getUserName() == user_id)
-
- if can_disable:
- # We disable further maintainer invites by jacking up
- # the member's invitation threshold
- points = self.getPoints( user_id )
- new_points = points + 1000
-
- self.setPointThreshold( user_id = user_id
- , points = new_points
- )
-
- if 'Pending Maintainer' in role_list:
- del role_list[role_list.index('Pending Maintainer')]
- member.setSecurityProfile( roles=role_list )
-
-
- security.declareProtected(AnointMaintainer, 'anointMaintainer')
- def anointMaintainer( self, user_id ):
- """ Make a member a maintainer """
- member = self.getMemberById( user_id )
- role_list = list( member.getRoles() )
- cur_user = self.getAuthenticatedMember()
- can_anoint = (cur_user.has_permission('Manage portal', self) or
- cur_user.getUserName() == user_id)
-
- if 'Maintainer' not in role_list and can_anoint:
- role_list.append('Maintainer')
-
- if 'Pending Maintainer' in role_list:
- del role_list[role_list.index('Pending Maintainer')]
-
- member.setSecurityProfile( roles=role_list )
-
-
- security.declareProtected(AnointMaintainer, 'declineMaintainer')
- def declineMaintainer( self, user_id ):
- """ The member declines the maintainer invitation """
- cur_user = self.getAuthenticatedMember()
- role_list = list( cur_user.getRoles() )
-
- if ( cur_user.getUserName() == user_id and
- 'Pending Maintainer' in role_list ):
- del role_list[role_list.index('Pending Maintainer')]
- cur_user.setSecurityProfile( roles=role_list )
-
- cur_user.grantPoints( points=0 )
-
-
- security.declareProtected(DemoteMaintainer, 'demoteMaintainer')
- def demoteMaintainer( self, user_id ):
- """ Yank the Maintainer role from a member """
- member = self.getMemberById( user_id )
- role_list = list( member.getRoles() )
-
- if 'Maintainer' in role_list:
- del role_list[role_list.index('Maintainer')]
- member.setSecurityProfile( roles=role_list )
-
-
- security.declareProtected(ManagePortal, 'inviteMaintainer')
- def inviteMaintainer( self, user_id, REQUEST ):
- """ Send the invitation for a member to become Maintainer """
- member = self.getMemberById( user_id )
-
- if member is not None:
- role_list = list( member.getRoles() )
-
- if (not 'Maintainer' in role_list and
- not 'Pending Maintainer' in role_list):
-
- # Make the member a "Pending Maintainer"
- role_list.append('Pending Maintainer')
- member.setSecurityProfile( roles=role_list )
-
- # Create and send the email message
- template = self.maintainer_invitation_template
- mail_text = template( self
- , REQUEST
- , member = member
- )
-
- host = self.MailHost
- host.send( mail_text )
def listActions( self, info=None ):
=== Products/ZopeOrg-NV/ZopeOrgWorkflow.py 1.11 => 1.12 ===
self.setReviewStateOf(ob, 'published', action, comment)
- # Give the member a cookie
- mem_tool = getToolByName(self, 'portal_membership')
- mem_tool.grantPoints( user_id=content_creator
- , points=1
- )
-
elif action == 'reject':
if not allow_review or is_owner:
raise 'Unauthorized', 'Not authorized'
@@ -311,11 +305,6 @@
except: pass
self.setReviewStateOf(moved_obj, 'shared', action, comment)
-
- # Give the member a cookie
- mem_tool.grantPoints( user_id=obj_creatorName
- , points=2
- )
fav_obj = Favorite( id=new_obj_id
, title=moved_obj.Title()
More information about the zopeorg-checkins
mailing list