From d4bc4ac3d0ecf67103f323d0d7109483e9714e23 Mon Sep 17 00:00:00 2001
From: Toby <toby.junk@gmail.com>
Date: Thu, 24 May 2012 13:58:50 +0100
Subject: [PATCH] 2147 fix facet display pills in search

---
 ckan/controllers/package.py        |  7 +++++++
 ckan/templates/package/search.html | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index 46b8cd185fa..69769066dc2 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -186,6 +186,9 @@ def pager_url(q=None, page=None):
 
         try:
             c.fields = []
+            # c.fields_grouped will contain a dict of params containing
+            # a list of values eg {'tags':['tag1', 'tag2']}
+            c.fields_grouped = {}
             search_extras = {}
             fq = ''
             for (param, value) in request.params.items():
@@ -194,6 +197,10 @@ def pager_url(q=None, page=None):
                     if not param.startswith('ext_'):
                         c.fields.append((param, value))
                         fq += ' %s:"%s"' % (param, value)
+                        if param not in c.fields_grouped:
+                            c.fields_grouped[param] = [value]
+                        else:
+                            c.fields_grouped[param].append(value)
                     else:
                         search_extras[param] = value
 
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index e6c138e52d9..e5153d0e310 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -33,15 +33,17 @@
                 <py:when test="request.params and c.page.item_count == 0">Sorry no datasets found for &#147;${c.q}&#148;</py:when>
                 <py:otherwise>All datasets</py:otherwise>
               </strong>
-              <py:for each="(field, value) in c.fields">
+              <py:for each="field in c.fields_grouped">
                 <span class="facet">${c.facet_titles.get(field)}:</span>
-                <span class="filtered pill" py:choose="">
-                  <py:when test="c.translated_fields and c.translated_fields.has_key((field,value))">
-                    ${c.translated_fields[(field,value)]}
-                  </py:when>
-                  <py:otherwise>${value}</py:otherwise>
-                  <a href="${c.remove_field(field, value)}" class="remove icon-remove icon-white">[remove]</a>
-                </span>
+                <py:for each="value in c.fields_grouped[field]">
+                  <span class="filtered pill" py:choose="">
+                    <py:when test="c.translated_fields and c.translated_fields.has_key((field,value))">
+                      ${c.translated_fields[(field,value)]}
+                    </py:when>
+                    <py:otherwise>${value}</py:otherwise>
+                    <a href="${c.remove_field(field, value)}" class="remove icon-remove icon-white">[remove]</a>
+                  </span>
+                </py:for>
               </py:for>
               <p class="extra" py:if="request.params and c.page.item_count == 0">Try another search term,
               browse the datasets below or <a href="${h.url_for(action='new', id=None)}">add your own data</a>.</p>