From 73e07ba10dab964888a1d04914c6f534442a814d Mon Sep 17 00:00:00 2001
From: Andy Babic <andyjbabic@gmail.com>
Date: Mon, 17 Jun 2019 22:17:59 +0100
Subject: [PATCH] Fix elasticsearch search backend tests broken by #5208

---
 wagtail/contrib/modeladmin/views.py    | 12 +-----------
 wagtail/tests/modeladmintest/models.py |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/wagtail/contrib/modeladmin/views.py b/wagtail/contrib/modeladmin/views.py
index 2d779ac68..98dd44b16 100644
--- a/wagtail/contrib/modeladmin/views.py
+++ b/wagtail/contrib/modeladmin/views.py
@@ -439,19 +439,9 @@ class IndexView(WMABaseView):
         # database backends.
         pk_name = self.opts.pk.name
 
-        if hasattr(self.model, 'get_filterable_search_fields'):
-            # The model is indexed, so let's be careful to only add
-            # indexed fields to ordering where possible
-            filterable_fields = self.model.get_filterable_search_fields()
-        else:
-            filterable_fields = None
-
         if not (set(ordering) & {'pk', '-pk', pk_name, '-' + pk_name}):
             # ordering isn't already being applied to pk
-            if filterable_fields is None or 'pk' in filterable_fields:
-                ordering.append('-pk')
-            else:
-                ordering.append('-' + pk_name)
+            ordering.append('-' + pk_name)
 
         return ordering
 
diff --git a/wagtail/tests/modeladmintest/models.py b/wagtail/tests/modeladmintest/models.py
index 2065f3f1c..250ea4b86 100644
--- a/wagtail/tests/modeladmintest/models.py
+++ b/wagtail/tests/modeladmintest/models.py
@@ -33,7 +33,7 @@ class Book(models.Model, index.Indexed):
     search_fields = [
         index.SearchField('title'),
         index.FilterField('title'),
-        index.FilterField('pk'),
+        index.FilterField('id'),
     ]
 
     def __str__(self):