From 5062e9215f4e27b79cad8b7a8ecee8a398c91e41 Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Mon, 30 Mar 2020 23:13:25 +0200 Subject: [PATCH] Swap filtered/unfiltered view --- formity/admin.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/formity/admin.py b/formity/admin.py index d626627..ec671ee 100644 --- a/formity/admin.py +++ b/formity/admin.py @@ -99,12 +99,15 @@ class FaceshieldRequestAdmin(ModelView): class FilteredFaceshieldRequestAdmin(FaceshieldRequestAdmin): def get_query(self): - return super(FilteredFaceshieldRequestAdmin, self).get_query().filter(FaceshieldRequest.status != Status.rejected) + return super(FilteredFaceshieldRequestAdmin, self).get_query().filter(FaceshieldRequest.status != Status.rejected, FaceshieldRequest.status != Status.spam) + + def get_count_query(self): + return super(FilteredFaceshieldRequestAdmin, self).get_count_query().filter(FaceshieldRequest.status != Status.rejected, FaceshieldRequest.status != Status.spam) class ShippingFaceshieldRequestAdmin(FaceshieldRequestAdmin): column_editable_list = ('shipping_name', 'shipping_street', 'shipping_postalcode', 'shipping_city', 'status') column_list = ['id', 'entity_info', 'full_name', *column_editable_list] -admin.add_view(FaceshieldRequestAdmin(FaceshieldRequest, db.session)) -admin.add_view(FilteredFaceshieldRequestAdmin(FaceshieldRequest, db.session, name='FaceshieldRequest (Filtered)', endpoint='request_filtered')) +admin.add_view(FilteredFaceshieldRequestAdmin(FaceshieldRequest, db.session)) +admin.add_view(FaceshieldRequestAdmin(FaceshieldRequest, db.session, name='FaceshieldRequest (Unfiltered)', endpoint='request_unfiltered')) admin.add_view(ShippingFaceshieldRequestAdmin(FaceshieldRequest, db.session, name='FaceshieldRequest (Shipping)', endpoint='request_shipping'))