--- a/app/soc/modules/gsoc/views/models/mentor.py	Sun Oct 25 18:49:43 2009 -0700
+++ b/app/soc/modules/gsoc/views/models/mentor.py	Sun Oct 25 21:47:25 2009 -0700
@@ -51,16 +51,15 @@
     rights['edit'] = [('checkIsMyActiveRole', mentor_logic)]
     rights['delete'] = ['checkIsDeveloper']
     rights['invite'] = [('checkHasActiveRoleForScope', org_admin_logic)]
-    rights['accept_invite'] = [('checkCanCreateFromRequest', 'mentor'),
-        ('checkIsNotStudentForProgramOfOrg', [org_logic,
+    rights['accept_invite'] = ['checkCanCreateFromRequest',
+        ('checkIsNotStudentForProgramOfOrgInRequest', [org_logic,
                                               student_logic])]
     rights['request'] = [
         ('checkIsNotStudentForProgramOfOrg',
             [org_logic, student_logic]),
         ('checkCanMakeRequestToGroup', org_logic)]
     rights['process_request'] = [
-        ('checkHasActiveRoleForScope', org_admin_logic),
-        ('checkCanProcessRequest', 'mentor')]
+        ('checkCanProcessRequest', [[org_admin_logic]])]
     rights['manage'] = [
         ('checkIsAllowedToManageRole', [mentor_logic, org_admin_logic])]