app/soc/modules/ghop/views/models/org_admin.py
changeset 3055 7f922641ccc9
parent 2919 cb677410c0f1
--- a/app/soc/modules/ghop/views/models/org_admin.py	Sun Oct 25 18:48:22 2009 -0700
+++ b/app/soc/modules/ghop/views/models/org_admin.py	Sun Oct 25 18:49:29 2009 -0700
@@ -54,12 +54,11 @@
     rights['delete'] = ['checkIsDeveloper']
     rights['invite'] = [('checkHasActiveRoleForScope',
                          ghop_org_admin_logic.logic)]
-    rights['accept_invite'] = [('checkCanCreateFromRequest', 'ghop/org_admin'),
-        ('checkIsNotStudentForProgramOfOrg', 
+    rights['accept_invite'] = ['checkCanCreateFromRequest',
+        ('checkIsNotStudentForProgramOfOrgInRequest', 
          [ghop_org_logic.logic, ghop_student_logic.logic])]
     rights['process_request'] = [
-        ('checkHasActiveRoleForScope', ghop_org_admin_logic.logic),
-        ('checkCanProcessRequest', 'ghop/org_admin')]
+        ('checkCanProcessRequest', [[ghop_org_admin_logic.logic]])]
     rights['manage'] = [
         ('checkIsAllowedToManageRole', [ghop_org_admin_logic.logic,
              ghop_org_admin_logic.logic])]