Changeset 924 for WAeUP_SRP

Timestamp:

22 Nov 2006, 16:54:23 (18 years ago)

Author:

joachim

Message:

removed username from member_search mask, because there is no easy way to
not search for student-members. In my opinion search for firstname, lastname
and email is sufficient.
The local-role SectionReader? is set for Authenticated in exportimport.py,
but now the import takes 3 times as long. I think we have to remove this
setting from exportimport.

Location:

WAeUP_SRP/trunk

Files:

• exportimport.py (modified) (1 diff)
• profiles/default/actions.xml (modified) (2 diffs)
• profiles/default/layouts/members_search.xml (modified) (1 diff)
• skins/waeup_custom/getCPSCandidateLocalRoles.py (modified) (1 diff)
• skins/waeup_directory/layout_waeup_dir_view.pt (modified) (1 diff)
• skins/waeup_directory/search_members.py (modified) (1 diff)

WAeUP_SRP/trunk/exportimport.py

@@ -77 +77 @@
     pm.setLocalGroupRoles(campus.students,['group:ClearanceOfficers',
                                            'role:Student',],'SectionReader')
-    pm.setLocalGroupRoles(campus.academics,['Authenticated',
+    pm.setLocalGroupRoles(campus.academics,['role:Authenticated',
                                            ],'SectionReader')
     importWAeUPTable(site.portal_accommodation, '', context,'accommodation')

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -4 +4 @@
   <action title="Search Members" action_id="member_view" category="user"
      condition_expr="member"
-     url_expr="string:${portal_url}/cpsdirectory_entry_search_form?dirname=members"
+     url_expr="string:${portal_url}/search_members_form"
      visible="False">
    <permission>View</permission>
@@ -100 +100 @@
   <action title="Portal Members" action_id="members" category="global"
      condition_expr="member"
-     url_expr="string:${portal_url}/cpsdirectory_entry_search_form?dirname=members"
+     url_expr="string:${portal_url}/search_members_form"
      visible="True">
    <permission>Modify portal content</permission>

WAeUP_SRP/trunk/profiles/default/layouts/members_search.xml

@@ -45 +45 @@
  <table>
   <row>
-   <cell name="id" ncols="2"/>
-  </row>
-  <row>
    <cell name="givenName"/>
    <cell name="sn"/>

WAeUP_SRP/trunk/skins/waeup_custom/getCPSCandidateLocalRoles.py

@@ -20 +20 @@
 
 
-#return mtool.getCPSCandidateLocalRoles(context)
+allowed_roles = mtool.getCPSCandidateLocalRoles(context)
 
 
-if member.id == 'admin'
-  return ['SectionReader','SectionManager','ClearanceOfficer', 'SectionOfficer']
+if member.id in ("admin","perry"):
+    return ['SectionReader','SectionManager','ClearanceOfficer', 'SectionOfficer']
 return ['ClearanceOfficer', 'SectionOfficer']

WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_view.pt

@@ -1 +1 @@
 <tal:block define="layout options/layout;
-                   dirname request/dirname;
+                   dirname string:members;
                    dir here/portal_directories/?dirname;
                    id_field dir/id_field;

WAeUP_SRP/trunk/skins/waeup_directory/search_members.py

@@ -24 +24 @@
         mapping[key] = value
 
-result_fields = context.getDirectoryResultFields(dir.getId(),
-                                                 dir.title_field)
+#result_fields = context.getDirectoryResultFields(dir.getId(),
+#                                                 dir.title_field)
+result_fields = [{'id': 'sn', 'title': 'label_last_name', 'sort': 'asc'},
+                  {'id': 'givenName', 'title': 'label_first_name'},
+                  {'id': 'email', 'title': 'label_email'},
+                  #{'id': id_field, 'title': 'label_user_name'},
+                  ]
 
 return_fields = []