diff -r 08a2d7a73760 -r 0c205ce4e27d app/soc/views/models/mentor.py --- a/app/soc/views/models/mentor.py Tue Feb 17 21:16:35 2009 +0000 +++ b/app/soc/views/models/mentor.py Wed Feb 18 19:49:39 2009 +0000 @@ -54,12 +54,14 @@ rights['create'] = ['checkIsDeveloper'] rights['edit'] = [('checkHasActiveRoleForScope', soc.logic.models.mentor.logic)] rights['delete'] = ['checkIsDeveloper'] - # TODO accessCheck checkIsAdministratorForOrg - rights['invite'] = ['checkIsDeveloper'] + rights['invite'] = [('checkHasActiveRoleForScope', + soc.logic.models.org_admin.logic)] rights['accept_invite'] = [('checkCanCreateFromRequest', 'mentor'), 'checkIsNotStudentForProgramOfOrg'] - # TODO accessCheck checkIsAdministratorForOrg - rights['process_request'] = ['checkIsDeveloper', + rights['request'] = ['checkIsNotStudentForProgramOfOrg', + ('checkCanMakeRequestToGroup', org_logic)] + rights['process_request'] = [ + ('checkHasActiveRoleForScope', soc.logic.models.org_admin.logic), ('checkCanProcessRequest', 'mentor')] rights['manage'] = [ ('checkIsAllowedToManageRole', [soc.logic.models.mentor.logic,