--- a/app/soc/views/models/club_member.py	Sun Feb 01 20:41:58 2009 +0000
+++ b/app/soc/views/models/club_member.py	Sun Feb 01 20:44:47 2009 +0000
@@ -26,6 +26,7 @@
 
 from soc.logic import dicts
 from soc.logic.models import club as club_logic
+from soc.logic.models import club_admin as club_admin_logic
 from soc.views.helper import access
 from soc.views.helper import dynaform
 from soc.views.helper import widgets
@@ -50,17 +51,17 @@
 
     rights = access.Checker(params)
     rights['create'] = ['checkIsDeveloper']
-    rights['edit'] = [('checkIsMyActiveRole',soc.logic.models.club_member)]
+    rights['edit'] = [('checkHasRole', club_admin_logic.logic)]
     rights['delete'] = ['checkIsDeveloper']
-    rights['invite'] = ['checkIsClubAdminForClub']
+    rights['invite'] = [('checkHasRole', club_admin_logic.logic)]
     rights['accept_invite'] = [('checkCanCreateFromRequest','club_member')]
     rights['request'] = ['checkIsUser',
-        ('checkCanMakeRequestToGroup', club_logic)]
-    rights['process_request'] = ['checkIsClubAdminForClub',
-        ('checkCanProcessRequest','club_member')]
-    rights['manage'] = [
-        ('checkIsAllowedToManageRole', [soc.logic.models.club_member,
-             soc.logic.models.club_admin])]
+                         ('checkCanMakeRequestToGroup', club_logic)]
+    rights['process_request'] = [('checkHasRole', club_admin_logic.logic),
+                                 ('checkCanProcessRequest','club_member')]
+    rights['manage'] = [('checkIsAllowedToManageRole',
+                         [soc.logic.models.club_member,
+                          soc.logic.models.club_admin])]
 
     new_params = {}
     new_params['logic'] = soc.logic.models.club_member.logic