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 ab10c5d..0000000 Binary files a/example/db.sqlite3 and /dev/null differ diff --git a/example/polls/admin2.py b/example/polls/admin2.py index 7c632fe..a532b9e 100644 --- a/example/polls/admin2.py +++ b/example/polls/admin2.py @@ -9,7 +9,6 @@ from .models import Poll, Choice class ChoiceInline(Admin2TabularInline): model = Choice fields = '__all__' - extra = 3 class PollAdmin(ModelAdmin2):