From 2473fa3069d8cc4749c0a80d4aabf6536b497390 Mon Sep 17 00:00:00 2001 From: "Asif Saif Uddin (Auvi)" Date: Mon, 17 Sep 2018 13:58:30 +0600 Subject: [PATCH] fix deprecation warnings (#463) * fix deprecation warning * fix deprecation warning * fix deprecation warning of django filter * fix deprecation warning of django filter widget * undo widget * fixed field_name deprecation warning * fixed pagination error * fixed pagination error --- djadmin2/filters.py | 8 ++++---- djadmin2/views.py | 2 ++ example/db.sqlite3 | Bin 84992 -> 0 bytes example/polls/admin2.py | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 example/db.sqlite3 diff --git a/djadmin2/filters.py b/djadmin2/filters.py index f923f98..fc87cfb 100644 --- a/djadmin2/filters.py +++ b/djadmin2/filters.py @@ -87,7 +87,7 @@ def build_list_filter(request, model_admin, queryset): filters.append(field_filter) filterset_dict = {} for field_filter in filters: - filterset_dict[field_filter.name] = field_filter + filterset_dict[field_filter.field_name] = field_filter fields = list(filterset_dict.keys()) filterset_dict['Meta'] = type( type_str('Meta'), @@ -103,15 +103,15 @@ def build_list_filter(request, model_admin, queryset): def build_date_filter(request, model_admin, queryset, field_name="published_date"): filterset_dict = { "year": NumericDateFilter( - name=field_name, + field_name=field_name, lookup_expr="year", ), "month": NumericDateFilter( - name=field_name, + field_name=field_name, lookup_expr="month", ), "day": NumericDateFilter( - name=field_name, + field_name=field_name, lookup_expr="day", ) } diff --git a/djadmin2/views.py b/djadmin2/views.py index ec8ca71..e0a134b 100644 --- a/djadmin2/views.py +++ b/djadmin2/views.py @@ -116,6 +116,7 @@ class ModelListView(Admin2ModelMixin, generic.ListView): app name. """ default_template_name = "model_list.html" + paginate_by = 10 permission_classes = ( permissions.IsStaffPermission, permissions.ModelViewPermission) @@ -494,6 +495,7 @@ class ModelHistoryView(Admin2ModelMixin, generic.ListView): app name. """ default_template_name = "model_history.html" + paginate_by = 10 permission_classes = ( permissions.IsStaffPermission, permissions.ModelChangePermission diff --git a/example/db.sqlite3 b/example/db.sqlite3 deleted file mode 100644 index ab10c5db2eb8b57de86ddc24ff6abd835491b4a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84992 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