change search result order

diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html
index 4973733ba419310a304572c5bcb0f6f30bc7dca9..7cf334673bb79c818f0edc9e7ede3fb41cd5381a 100644 (file)
--- a/telemeta/templates/telemeta_default/search_results.html
+++ b/telemeta/templates/telemeta_default/search_results.html
@@ -46,9 +46,7 @@
 
 {% ifequal type 'items' %}
 
-  <p><b>Items ({{items_num}})</b> | 
-  <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">
-    Collections ({{collections_num}})</a></p>
+  <p><a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <b>Items ({{items_num}})</b></p>
 
   {% with object_list as items %}
    <div class="fullpage">
@@ -58,9 +56,8 @@
 
 {% else %}
 
-  <p><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">
-    Items ({{items_num}})</a> |
-  <b>Collections ({{collections_num}})</b></p>
+  <p><b>Collections ({{collections_num}})</b> | <a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a>
+  </p>
 
   {% with object_list as collections %}
    <div class="fullpage">

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 779387df5126cda55d8c053dfaf045bf6db3c1d8..fad80e448ad0bcdde1bc3ceb4d690d89174491f6 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -611,7 +611,7 @@ class WebView(object):
                 criteria[key] = value
 
         if type is None:
-            if collections.count() and not items.count():
+            if collections.count():
                 type = 'collections'
             else:
                 type = 'items'
@@ -626,11 +626,7 @@ class WebView(object):
             extra_context={'criteria': criteria, 'collections_num': collections.count(), 
                 'items_num': items.count(), 'type' : type})
 
-
-
-
     # ADMIN
-
     @method_decorator(permission_required('sites.change_site'))
     def admin_index(self, request):
         return render(request, 'telemeta/admin.html', self.__get_admin_context_vars())
@@ -643,7 +639,6 @@ class WebView(object):
     def admin_enumerations(self, request):
         return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars())
 
-    
     # ENUMERATIONS
     def __get_enumerations_list(self):
         from django.db.models import get_models