app/soc/views/models/club.py
changeset 998 125257161908
parent 993 99c46908b4b6
child 1003 b13da1ddcd50
--- a/app/soc/views/models/club.py	Sun Jan 25 23:35:39 2009 +0000
+++ b/app/soc/views/models/club.py	Mon Jan 26 09:44:00 2009 +0000
@@ -42,8 +42,6 @@
 from soc.views.models import group
 
 import soc.logic.models.club
-import soc.logic.models.club_admin
-import soc.logic.models.club_member
 import soc.views.helper
 
 
@@ -65,6 +63,7 @@
     rights['delete'] = [access.checkIsDeveloper]
     rights['list'] = [access.checkIsDeveloper]
     rights['list_requests'] = [access.checkIsClubAdminForClub]
+    rights['list_roles'] = [access.checkIsClubAdminForClub]
     rights['applicant'] = [access.checkIsApplicationAccepted(club_app_logic)]
 
     new_params = {}
@@ -86,11 +85,6 @@
                                    required=False),
         }
 
-    # set the roles logic
-    new_params['roles_logic'] =  {
-        'club_admin': soc.logic.models.club_admin.logic,
-        'club_member': soc.logic.models.club_admin.logic}
-
     params = dicts.merge(params, new_params)
 
     super(View, self).__init__(params=params)
@@ -223,6 +217,7 @@
 edit = view.edit
 list = view.list
 list_requests = view.listRequests
+list_roles = view.listRoles
 public = view.public
 export = view.export
 pick = view.pick