Changeset 930 for WAeUP_SRP


Ignore:
Timestamp:
24 Nov 2006, 08:01:42 (18 years ago)
Author:
joachim
Message:

exclude all homeless members from search

Location:
WAeUP_SRP/trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/Academics.py

    r929 r930  
    230230                msg = "Department %(department_code)s for Course %(code)s not found" % course
    231231                logger.info(msg)
    232                 no_import.write(msg)
     232                no_import.write('"%s",' % msg)
    233233                no_import.write(format % course + "\n")
    234234                continue
     
    237237                msg = "Dupplicate Course %(code)s" % course
    238238                logger.info(msg)
    239                 no_import.write(msg)
     239                no_import.write('"%s",' % msg)
    240240                no_import.write(format % course + "\n")
    241241                continue
  • WAeUP_SRP/trunk/__init__.py

    r918 r930  
    1616import PatchCPSMembershipTool
    1717import PatchCPSUserFolderUserFolder
     18import PatchZODBDirectory_searchEntries
    1819import PatchBasicWidgetsCPSStringWidget
    1920# 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

    r924 r930  
    4545 <table>
    4646  <row>
     47   <cell name="id" ncols="2"/>
     48  </row>
     49  <row>
    4750   <cell name="givenName"/>
    4851   <cell name="sn"/>
  • WAeUP_SRP/trunk/skins/waeup_directory/search_members.py

    r924 r930  
    2424        mapping[key] = value
    2525
    26 #result_fields = context.getDirectoryResultFields(dir.getId(),
    27 #                                                 dir.title_field)
    28 result_fields = [{'id': 'sn', 'title': 'label_last_name', 'sort': 'asc'},
    29                   {'id': 'givenName', 'title': 'label_first_name'},
    30                   {'id': 'email', 'title': 'label_email'},
    31                   #{'id': id_field, 'title': 'label_user_name'},
    32                   ]
     26#mapping['homeless'] = True
     27result_fields = context.getDirectoryResultFields(dir.getId(),
     28                                                 dir.title_field)
     29##result_fields = [{'id': 'sn', 'title': 'label_last_name', 'sort': 'asc'},
     30##                  {'id': 'givenName', 'title': 'label_first_name'},
     31##                  {'id': 'email', 'title': 'label_email'},
     32##                  {'id': id_field, 'title': 'label_user_name'},
     33##                  ]
    3334
    3435return_fields = []
  • WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt

    r923 r930  
    4646              </tal:block>
    4747          <td tal:define="roles python:data['roles']">
    48             <form action="." method="get" tal:attributes="action context/portal_url">
     48            <form action="." method="get"
     49                  tal:condition="roles"
     50                  tal:attributes="action context/portal_url">
    4951              <select class="form-element" name=":action"
    5052                      onChange="location.href='/'+this.options[this.selectedIndex].value"
    5153                      tal:attributes="onChange string:location.href='${context/portal_url}'+this.options[this.selectedIndex].value">
    52                 <option value="/search_members_form">Goto</option>
     54                <option value="/search_members_form">&nbsp;Goto&nbsp;</option>
    5355                <option tal:repeat="role roles" value="." tal:content="role/getId"
    5456                        tal:attributes="value string:${role/getPath}/folder_localrole_form"></option>
  • WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

    r919 r930  
    2626        <br />
    2727       
    28         <span tal:condition="python:member.id=='admin'">       
     28        <span tal:condition="python:member.id in ('admin','perry')">       
    2929        <h3>Unused</h3>
    3030        <table>
Note: See TracChangeset for help on using the changeset viewer.