# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1232921125 0
# Node ID 99c46908b4b648f2a6d262cd41b4941e6411d3f7
# Parent  e9f7d8e96b20b6b10ceae599de8836e943734142
Renamed role_names to role_logic and made it a dictionary.

It now maps a role_name to role_logic. This will be useful for listing for instance club members.

Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed

diff -r e9f7d8e96b20 -r 99c46908b4b6 app/soc/views/models/club.py
--- a/app/soc/views/models/club.py	Sun Jan 25 21:52:35 2009 +0000
+++ b/app/soc/views/models/club.py	Sun Jan 25 22:05:25 2009 +0000
@@ -42,6 +42,8 @@
 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
 
 
@@ -84,8 +86,10 @@
                                    required=False),
         }
 
-    # set the role names for the request overview
-    new_params['role_names'] =  ['club_admin', 'club_member']
+    # 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)
 
diff -r e9f7d8e96b20 -r 99c46908b4b6 app/soc/views/models/group.py
--- a/app/soc/views/models/group.py	Sun Jan 25 21:52:35 2009 +0000
+++ b/app/soc/views/models/group.py	Sun Jan 25 22:05:25 2009 +0000
@@ -124,7 +124,7 @@
     # set the pagename to include the link_id
     page_name = '%s %s' %(page_name, kwargs['link_id'])
 
-    role_names = params['role_names']
+    role_names = params['roles_logic'].keys()
 
     # list all incoming requests
     filter = {
diff -r e9f7d8e96b20 -r 99c46908b4b6 app/soc/views/models/sponsor.py
--- a/app/soc/views/models/sponsor.py	Sun Jan 25 21:52:35 2009 +0000
+++ b/app/soc/views/models/sponsor.py	Sun Jan 25 22:05:25 2009 +0000
@@ -28,8 +28,9 @@
 from soc.views.models import group
 
 import soc.models.sponsor
+import soc.logic.dicts
+import soc.logic.models.host
 import soc.logic.models.sponsor
-import soc.logic.dicts
 
 
 class View(group.View):
@@ -52,8 +53,8 @@
     new_params['name'] = "Program Owner"
     new_params['module_name'] = "sponsor"
 
-    # set the role names for the request overview
-    new_params['role_names'] =  ['host']
+    # set the roles logic
+    new_params['roles_logic'] =  {'host': soc.logic.models.host.logic}
 
     params = dicts.merge(params, new_params)