Merge pull request #146 from pennyfx/sort-fix

Fixed sorting issue: 738469

apps/base/helpers.py

@@ -71,16 +71,6 @@ def querystring(context, query, **params):
     return '&'.join(sorted(qs))
 
 
-@jinja2.contextfunction
-@register.function
-def select_selected(context, value):
-    bits = value.split('=');
-    if context['request'].GET.get(bits[0]) == bits[1]:
-        return 'selected=selected'
-    else:
-        return ''
-
-
 @register.function
 def replace(item, value):
     """Replaces first part of ``value`` with the second one

apps/search/helpers.py

@@ -3,6 +3,7 @@
 from elasticutils import S, F
 from jetpack.models import Package
 from jingo import register
+import jinja2
 
 
 def package_search(searchq='', user=None, score_on=None, **filters):
@@ -110,3 +111,13 @@ def _get_average_activity():
 
     cache.set(ACTIVITY_CACHE_KEY, average, 60*60*24)
     return average
+
+
+@jinja2.contextfunction
+@register.function
+def select_selected(context, value):
+    bits = value.split('=');
+    if context['request'].GET.get(bits[0]) == bits[1] or context.get('query')[bits[0]] == bits[1]:
+        return 'selected=selected'
+    else:
+        return ''

apps/search/views.py

@@ -31,7 +31,14 @@ def search(request):
     limit = 20
     activity_map = get_activity_scale()
 
-    sort = SORT_MAPPING.get(query.get('sort'), '_score' if q else '-activity')
+    if q and query.get('sort') == '':
+        sort = '_score'
+        query['sort'] = 'score' 
+    elif query.get('sort') == '':
+        sort = '-activity'
+        query['sort'] = 'activity'
+    else:
+        sort = SORT_MAPPING.get(query.get('sort'))
 
     filters = {}
     filters['user'] = request.user