Merge lp:~benoit.pierre/sloecode/sorted-lists into lp:sloecode

[Benoit Pierre]

- add support for custom Jinja2 filters
- add 2 sort filters
- use them to sort web UI lists when applicable

[Benoit Pierre (benoit.pierre)]

N.B.:

- sorting by method return value uses operator.methodcaller, which is only available starting with Python 2.6
- sorting using a dotted attribute (using operator.attrgetter), is only available starting with Python 2.6 too

I know Bazaar still support Python 2.4, I don't know about other components. The filters implementation will have to be changed if Python 2.4 is too be supported for sloecode.

[Thomi Richards (thomir-deactivatedaccount)]

Looks great, thanks. If we wanted to support python < 2.6 we'd have problems in other parts of the codebase as well (although off the top of my head I can't remember where, exactly). We made a deliberate decision not to support older distributions.. what can I say, we were lazy!

Thanks for your help - I'm merging this now.

review: Approve

=== modified file 'sloecode/config/environment.py'
--- sloecode/config/environment.py	2011-06-04 06:41:58 +0000
+++ sloecode/config/environment.py	2011-10-01 15:18:25 +0000
@@ -11,10 +11,10 @@
 from sloecode.bzr.factory import BazaarRepositoryFactory
 import sloecode.lib.app_globals as app_globals
 import sloecode.lib.helpers
+from sloecode.lib.filters import FILTERS
 from sloecode.config.routing import make_map
 from sloecode.model import init_model
 
-
 def load_environment(global_conf, app_conf):
     """Configure the Pylons environment via the ``pylons.config``
     object
@@ -39,13 +39,17 @@
     pylons.cache._push_object(config['pylons.app_globals'].cache)
 
     # Create the Jinja2 Environment
-    config['pylons.app_globals'].jinja2_env = Environment(
+    jinja2_env = Environment(
         extensions=['jinja2.ext.do'],
         loader=ChoiceLoader(
             [FileSystemLoader(path) for path in paths['templates']]))
+    config['pylons.app_globals'].jinja2_env = jinja2_env
     # Jinja2's unable to request c's attributes without strict_c
     config['pylons.strict_tmpl_context'] = True
 
+    # Register our custom filters.
+    jinja2_env.filters.update(FILTERS)
+
     # Setup the SQLAlchemy database engine
     # do this by creating the engine url from components:
     db_config = RawConfigParser()

=== added file 'sloecode/lib/filters.py'
--- sloecode/lib/filters.py	1970-01-01 00:00:00 +0000
+++ sloecode/lib/filters.py	2011-10-01 15:18:25 +0000
@@ -0,0 +1,19 @@
+"""Custom filters for Jinja2 templates
+"""
+
+
+from operator import attrgetter, methodcaller
+
+
+def do_attrsort(objs, attr):
+    return sorted(objs, key=attrgetter(attr))
+
+def do_methodsort(objs, method):
+    return sorted(objs, key=methodcaller(method))
+
+
+FILTERS = {
+    'attrsort':   do_attrsort,
+    'methodsort': do_methodsort,
+}
+

=== modified file 'sloecode/templates/admin/person-list.html'
--- sloecode/templates/admin/person-list.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/person-list.html	2011-10-01 15:18:25 +0000
@@ -26,7 +26,7 @@
           <th>Actions</th>
         </tr>
         {% set row_class = cycler('odd', 'even') %}
-        {% for person in people.items %}
+        {% for person in people.items|attrsort('login') %}
         <tr class="{{row_class.next()}}">
           <td>{{h.link_to(person.login|e,
                           h.url(controller='person',

=== modified file 'sloecode/templates/admin/project-list.html'
--- sloecode/templates/admin/project-list.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/project-list.html	2011-10-01 15:18:25 +0000
@@ -24,7 +24,7 @@
           <th>Actions</th>
         </tr>
         {% set row_class = cycler('odd', 'even') %}
-        {% for project in projects.items %}
+        {% for project in projects.items|attrsort('name') %}
         <tr class="{{row_class.next()}}">
           <td>{{h.link_to(project.name|e,
             h.url(controller='project', project_name=project.name),

=== modified file 'sloecode/templates/macros/nav.html'
--- sloecode/templates/macros/nav.html	2011-07-02 22:51:24 +0000
+++ sloecode/templates/macros/nav.html	2011-10-01 15:18:25 +0000
@@ -41,7 +41,7 @@
           <div class="yui3-menu-content">
             <ul>
               {# List of projects that this user is in #}
-              {% for membership in user_details.projects %}
+              {% for membership in user_details.projects|attrsort('project.name') %}
               <li class="yui3-menuitem">
                 {{ h.link_to(membership.project.name,
                 	h.url(controller='project',

=== modified file 'sloecode/templates/person-details.html'
--- sloecode/templates/person-details.html	2011-08-15 00:56:40 +0000
+++ sloecode/templates/person-details.html	2011-10-01 15:18:25 +0000
@@ -51,7 +51,7 @@
 
       <h2>Personal Repository:</h2>
       {{ h.help_link("What's a Personal Repository?", '/what-is/repo-type')}}
-      {% set branches = repo.get_branches() %}
+      {% set branches = repo.get_branches()|attrsort('get_name') %}
       {% if is_me %}
         <p>Your personal repository has {{branches|length}} branches.</p>
       {% else %}

=== modified file 'sloecode/templates/person-manage-keys.html'
--- sloecode/templates/person-manage-keys.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/person-manage-keys.html	2011-10-01 15:18:25 +0000
@@ -48,7 +48,7 @@
        {% if person.auth_keys|length %}
        <p>You have the following SSH Keys stored in the sloecode system. You may
          remove existing keys, or add new ones above.</p>
-       {% for key in person.auth_keys %}
+       {% for key in person.auth_keys|attrsort('key_name') %}
        <div class="box-header">
          <span class="label">Name: </span> {{key.key_name}}
        </div>

=== modified file 'sloecode/templates/project-details.html'
--- sloecode/templates/project-details.html	2011-08-15 01:43:23 +0000
+++ sloecode/templates/project-details.html	2011-10-01 15:18:25 +0000
@@ -34,7 +34,7 @@
           <th></th><th>Branch Name</th><th>Revisions</th><th>Actions</th>
         </tr>
 
-        {% for branch in branches %}
+        {% for branch in branches|methodsort('get_name') %}
         <tr>
           <td>
             {{h.image(h.url('/bzr_icon.png'), 'Bazaar Branch')}}
@@ -69,7 +69,7 @@
       <div class="details_list">
         <dl>
           <dt>Users in this Project</dt>
-          {% for member in project.users %}
+          {% for member in project.users|attrsort('person.name') %}
           <dd class="user">
             {{ h.link_to(member.person.name,
                 h.url(controller="person", person_name=member.person.login),

=== modified file 'sloecode/templates/project-manage-users.html'
--- sloecode/templates/project-manage-users.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/project-manage-users.html	2011-10-01 15:18:25 +0000
@@ -17,7 +17,7 @@
     <th>Add/Remove User</th>
     <th>Change Role</th>
   </tr>
-  {% for person in all_people %}
+  {% for person in all_people|attrsort('name') %}
   <tr>
     <td>
       {{ h.checkbox('usernames', value=person.login, id=person.login,