Swap filtered/unfiltered view

master
informatic 2020-03-30 23:13:25 +02:00
parent aeaf67eff3
commit 5062e9215f
1 changed files with 6 additions and 3 deletions

View File

@ -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'))