Changeset 930 for WAeUP_SRP/trunk

Timestamp:

24 Nov 2006, 08:01:42 (18 years ago)

Author:

joachim

Message:

exclude all homeless members from search

Location:

WAeUP_SRP/trunk

Files:

• Academics.py (modified) (2 diffs)
• PatchZODBDirectory_searchEntries.py (added)
• __init__.py (modified) (1 diff)
• profiles/default/layouts/members_search.xml (modified) (1 diff)
• skins/waeup_directory/search_members.py (modified) (1 diff)
• skins/waeup_directory/search_members_results.pt (modified) (1 diff)
• skins/waeup_pins/batch_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/Academics.py

@@ -230 +230 @@
                 msg = "Department %(department_code)s for Course %(code)s not found" % course
                 logger.info(msg)
-                no_import.write(msg)
+                no_import.write('"%s",' % msg)
                 no_import.write(format % course + "\n")
                 continue
@@ -237 +237 @@
                 msg = "Dupplicate Course %(code)s" % course
                 logger.info(msg)
-                no_import.write(msg)
+                no_import.write('"%s",' % msg)
                 no_import.write(format % course + "\n")
                 continue

WAeUP_SRP/trunk/__init__.py

@@ -16 +16 @@
 import PatchCPSMembershipTool
 import PatchCPSUserFolderUserFolder
+import PatchZODBDirectory_searchEntries
 import PatchBasicWidgetsCPSStringWidget
 # Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.

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_directory/search_members.py

@@ -24 +24 @@
         mapping[key] = value
 
-#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'},
-                  ]
+#mapping['homeless'] = True
+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 = []

WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt

@@ -46 +46 @@
               </tal:block>
           <td tal:define="roles python:data['roles']">
-            <form action="." method="get" tal:attributes="action context/portal_url">
+            <form action="." method="get"
+                  tal:condition="roles"
+                  tal:attributes="action context/portal_url">
               <select class="form-element" name=":action" 
                       onChange="location.href='/'+this.options[this.selectedIndex].value"
                       tal:attributes="onChange string:location.href='${context/portal_url}'+this.options[this.selectedIndex].value">
-                <option value="/search_members_form">Goto</option>
+                <option value="/search_members_form">&nbsp;Goto&nbsp;</option>
                 <option tal:repeat="role roles" value="." tal:content="role/getId"
                         tal:attributes="value string:${role/getPath}/folder_localrole_form"></option>

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -26 +26 @@
         <br />
         
-        <span tal:condition="python:member.id=='admin'">        
+        <span tal:condition="python:member.id in ('admin','perry')">        
         <h3>Unused</h3>
         <table>