From 1ed27acbaae3232bc8869bce8d09de55b0079aac Mon Sep 17 00:00:00 2001
From: Brandon Taylor <alsoicode@gmail.com>
Date: Fri, 5 Oct 2018 10:53:56 -0400
Subject: [PATCH] Fix Sort Link

Updated conditional to not add filter expression if a search has been performed on the queryset.
---
 .../templates/adminsortable/change_list_with_sort_link.html     | 2 +-
 sample_project/samples/admin.py                                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/adminsortable/templates/adminsortable/change_list_with_sort_link.html b/adminsortable/templates/adminsortable/change_list_with_sort_link.html
index eb4b4e4..97885ae 100644
--- a/adminsortable/templates/adminsortable/change_list_with_sort_link.html
+++ b/adminsortable/templates/adminsortable/change_list_with_sort_link.html
@@ -9,7 +9,7 @@
             var url = window.location.href;
             var urlParts = url.split('?');
 
-            if (urlParts.length === 2) {
+            if (urlParts.length === 2 && urlParts[1].substr(0, 2) !== 'q=') {
                 $('a#change-order').attr('href', './sort/?filter_expression=' + urlParts[1]);
             }
         });
diff --git a/sample_project/samples/admin.py b/sample_project/samples/admin.py
index 993eae7..6947e46 100644
--- a/sample_project/samples/admin.py
+++ b/sample_project/samples/admin.py
@@ -88,6 +88,7 @@ class ProjectAdmin(SortableAdmin):
     list_display = ['__str__', 'category']
     list_filter = ('category__title',)
     after_sorting_js_callback_name = 'afterSortCallback'
+    search_fields = ['title']
     sortable_change_list_template = 'adminsortable/custom_change_list.html'
     sortable_change_form_template = 'adminsortable/custom_change_form.html'