From 266b0acc65a7abca293c1f23e7ec21a246f7437e Mon Sep 17 00:00:00 2001 From: Rense VanderHoek <264562+rense@users.noreply.github.com> Date: Thu, 18 Oct 2018 08:23:18 +0200 Subject: [PATCH] Django 2.1 compatability fix (#345) Skips adding 'sortable_by' arg for Django versions < 2.1 --- jet/utils.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jet/utils.py b/jet/utils.py index 65ccf0c8..31e72c38 100644 --- a/jet/utils.py +++ b/jet/utils.py @@ -216,12 +216,21 @@ def get_model_queryset(admin_site, model, request, preserved_filters=None): ChangeList = model_admin.get_changelist(request) + change_list_args = [ + request, model, list_display, list_display_links, list_filter, + model_admin.date_hierarchy, search_fields, list_select_related, + model_admin.list_per_page, model_admin.list_max_show_all, + model_admin.list_editable, model_admin] + try: - cl = ChangeList( - request, model, list_display, list_display_links, list_filter, model_admin.date_hierarchy, search_fields, - list_select_related, model_admin.list_per_page, model_admin.list_max_show_all, model_admin.list_editable, - model_admin) + sortable_by = model_admin.get_sortable_by(request) + change_list_args.append(sortable_by) + except AttributeError: + # django version < 2.1 + pass + try: + cl = ChangeList(*change_list_args) queryset = cl.get_queryset(request) except IncorrectLookupParameters: pass