diff -r 6ca30967d1bb -r 7f922641ccc9 app/soc/views/models/club_member.py --- a/app/soc/views/models/club_member.py Sun Oct 25 18:48:22 2009 -0700 +++ b/app/soc/views/models/club_member.py Sun Oct 25 18:49:29 2009 -0700 @@ -56,12 +56,11 @@ rights['edit'] = [('checkIsMyActiveRole', club_member_logic.logic)] rights['delete'] = ['checkIsDeveloper'] rights['invite'] = [('checkHasActiveRoleForScope', club_admin_logic.logic)] - rights['accept_invite'] = [('checkCanCreateFromRequest','club_member')] + rights['accept_invite'] = ['checkCanCreateFromRequest'] rights['request'] = ['checkIsUser', ('checkCanMakeRequestToGroup', club_logic.logic)] - rights['process_request'] = [('checkHasActiveRoleForScope', - club_admin_logic.logic), - ('checkCanProcessRequest','club_member')] + rights['process_request'] = [('checkCanProcessRequest', + [[club_admin_logic.logic]])] rights['manage'] = [('checkIsAllowedToManageRole', [soc.logic.models.club_member.logic, club_admin_logic.logic])] @@ -110,15 +109,6 @@ super(View, self)._editPost(request, entity, fields) - def _acceptInvitePost(self, fields, request, context, params, **kwargs): - """Fills in the fields that were missing in the invited_created_form. - - For params see base.View._acceptInvitePost() - """ - # fill in the appropriate fields that were missing in the form - fields['user'] = fields['link_id'] - fields['link_id'] = fields['user'].link_id - view = View()