# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1256532445 25200
# Node ID 966bbe3e204d5333d585864042b75db786e85187
# Parent  64bb50e94a3764b58cac5f2323c1bbe501b38087
Changed the access checks in the GSoC module to match the new checks.

diff -r 64bb50e94a37 -r 966bbe3e204d app/soc/modules/gsoc/views/models/mentor.py
--- 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])]
 
diff -r 64bb50e94a37 -r 966bbe3e204d app/soc/modules/gsoc/views/models/org_admin.py
--- a/app/soc/modules/gsoc/views/models/org_admin.py	Sun Oct 25 18:49:43 2009 -0700
+++ b/app/soc/modules/gsoc/views/models/org_admin.py	Sun Oct 25 21:47:25 2009 -0700
@@ -52,11 +52,11 @@
     rights['delete'] = ['checkIsDeveloper']
     rights['invite'] = [('checkHasActiveRoleForScope',
                          org_admin_logic)]
-    rights['accept_invite'] = [('checkCanCreateFromRequest', 'org_admin'),
-        ('checkIsNotStudentForProgramOfOrg', [org_logic, student_logic])]
+    rights['accept_invite'] = ['checkCanCreateFromRequest',
+        ('checkIsNotStudentForProgramOfOrgInRequest',
+         [org_logic, student_logic])]
     rights['process_request'] = [
-        ('checkHasActiveRoleForScope', org_admin_logic),
-        ('checkCanProcessRequest', 'org_admin')]
+        ('checkCanProcessRequest', [[org_admin_logic]])]
     rights['manage'] = [
         ('checkIsAllowedToManageRole', [org_admin_logic, org_admin_logic])]