Merge pull request #16 from davidbgk/15-remove-unfiltered-tabs-results

Remove orgs and users on tags' search, fixes #15
opendatateam · May 5, 2015 · 89f30fa · 89f30fa
2 parents 0927c42 + 5289d76
commit 89f30fa
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 42 deletions.
diff --git a/udata/core/search/views.py b/udata/core/search/views.py
@@ -13,15 +13,19 @@
 def render_search():
     params = multi_to_dict(request.args)
     params['facets'] = True
-    datasets, organizations, reuses, users = search.multiquery(
+    search_queries = [
         search.SearchQuery(Dataset, **params),
-        search.SearchQuery(Organization, **params),
-        search.SearchQuery(Reuse, **params),
-        search.SearchQuery(User, **params),
-    )
+        search.SearchQuery(Reuse, **params)
+    ]
+    results_labels = ['datasets', 'reuses']
+    # We only fetch orgs and users if this is not a tag-based search
+    # because these resources do not have tags so it's irrelevant.
+    if 'tag' not in params:
+        search_queries += [
+            search.SearchQuery(Organization, **params),
+            search.SearchQuery(User, **params)
+        ]
+        results_labels += ['organizations', 'users']
+    results = search.multiquery(*search_queries)
     return theme.render('search.html',
-        datasets=datasets,
-        organizations=organizations,
-        reuses=reuses,
-        users=users
-    )
+                        **dict(zip(results_labels, results)))
diff --git a/udata/templates/search.html b/udata/templates/search.html
@@ -30,18 +30,22 @@
             <span class="badge">{{ reuses.total }}</span>
         </a>
     </li>
-    <li>
-        <a href="#organizations" data-toggle="tab">
-            {{ _('Organizations') }}
-            <span class="badge">{{ organizations.total }}</span>
-        </a>
-    </li>
-    <li>
-        <a href="#users" data-toggle="tab">
-            {{ _('Users') }}
-            <span class="badge">{{ users.total }}</span>
-        </a>
-    </li>
+    {% if organizations %}
+        <li>
+            <a href="#organizations" data-toggle="tab">
+                {{ _('Organizations') }}
+                <span class="badge">{{ organizations.total }}</span>
+            </a>
+        </li>
+    {% endif %}
+    {% if users %}
+        <li>
+            <a href="#users" data-toggle="tab">
+                {{ _('Users') }}
+                <span class="badge">{{ users.total }}</span>
+            </a>
+        </li>
+    {% endif %}
 </ul>
 <div class="label-list">{{ s.filter_label('tag', _('Tag'), ficon('tag')) }}</div>
 {% endblock %}
@@ -72,26 +76,30 @@
     followers=(_('Stars'), 'desc'),
 ) }}
 </div>
-<div class="btn-toolbar search-toolbar wrapper hide" data-tab="#organizations">
-{{ s.breadcrum_toolbar(organizations, url=organizations_search_url,
-    exports=(
-        (_('Organizations'), 'site.organizations_csv', 'csv'),
-    ),
-    name=( _('Name'), 'asc'),
-    datasets=(_('Datasets'), 'desc'),
-    reuses=(_('Reuses'), 'desc'),
-    followers=(_('Followers'), 'desc'),
-) }}
-</div>
-<div class="btn-toolbar search-toolbar wrapper hide" data-tab="#users">
-{{ s.breadcrum_toolbar(users, url=users_search_url,
-    last_name=( _('Last Name'), 'asc'),
-    first_name=( _('First Name'), 'asc'),
-    datasets=(_('Datasets'), 'desc'),
-    reuses=(_('Reuses'), 'desc'),
-    followers=(_('Followers'), 'desc')
-) }}
-</div>
+{% if organizations %}
+    <div class="btn-toolbar search-toolbar wrapper hide" data-tab="#organizations">
+    {{ s.breadcrum_toolbar(organizations, url=organizations_search_url,
+        exports=(
+            (_('Organizations'), 'site.organizations_csv', 'csv'),
+        ),
+        name=( _('Name'), 'asc'),
+        datasets=(_('Datasets'), 'desc'),
+        reuses=(_('Reuses'), 'desc'),
+        followers=(_('Followers'), 'desc'),
+    ) }}
+    </div>
+{% endif %}
+{% if users %}
+    <div class="btn-toolbar search-toolbar wrapper hide" data-tab="#users">
+    {{ s.breadcrum_toolbar(users, url=users_search_url,
+        last_name=( _('Last Name'), 'asc'),
+        first_name=( _('First Name'), 'asc'),
+        datasets=(_('Datasets'), 'desc'),
+        reuses=(_('Reuses'), 'desc'),
+        followers=(_('Followers'), 'desc')
+    ) }}
+    </div>
+{% endif %}
 {% endblock %}
 
 {% block main_content %}