2441 make search :wresults sortable

ckan · May 29, 2012 · 45d18c6 · 45d18c6
1 parent c64a071
commit 45d18c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -181,6 +181,7 @@ def _sort_by(fields):
             c.sort_by_fields = []
         else:
             c.sort_by_fields = [ field.split()[0] for field in sort_by.split(',') ]
+        c.sort_by_selected = sort_by
 
         def pager_url(q=None, page=None):
             params = list(params_nopage)

diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
@@ -26,12 +26,7 @@
                 <input type="text" class="search" name="q" value="${c.q}" autocomplete="off" results="0" placeholder="${_('Search...')}" />
                 <button type="submit" value="${_('Search')}">Submit</button>
               </span>
-              <span class="control-group control-order-by">
-                <label for="field-order-by">Order by</label>
-                <select id="field-order-by" name="sort">
-                  <option selected="selected">Relevance</option>
-                </select>
-              </span>
+              ${h.snippet('snippets/sort_by.html', sort=c.sort_by_selected)}
               <span py:if="c.fields">
                 <py:for each="(k, v) in c.fields">
                   <input type="hidden" name="${k}" value="${v}" />

diff --git a/ckan/templates/snippets/sort_by.html b/ckan/templates/snippets/sort_by.html
@@ -0,0 +1,11 @@
+<span class="control-group control-order-by">
+  <label for="field-order-by">Order by</label>
+  <select id="field-order-by" name="sort">
+    <option value="relevance asc"{% if sort =='relevance asc' %} selected="selected"{% endif %}>Relevance</option>
+    <option value="name asc"{% if sort=='name asc' %} selected="selected"{% endif %}>Name asc</option>
+    <option value="name desc"{% if sort=='name desc' %} selected="selected"{% endif %}>Name desc</option>
+    <option value="metadata_modified desc"{% if sort=='metadata_modified desc' %} selected="selected"{% endif %}>Last Modified</option>
+    <option value="views_recent desc"{% if sort=='views_recent desc' %} selected="selected"{% endif %}>Popular</option>
+  </select>
+  <button type="submit">Go</button>
+</span>