app/soc/modules/gsoc/views/models/org_admin.py
changeset 3057 966bbe3e204d
parent 3043 187c1709756b
child 3058 5395772146cc
--- 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])]