diff --git a/formity/admin.py b/formity/admin.py index cf9d65f..02e8e11 100644 --- a/formity/admin.py +++ b/formity/admin.py @@ -77,9 +77,9 @@ class MapView(AdminSecurityMixin, flask_admin.BaseView): mapdata = [ { key: getattr(request, key).name if isinstance(getattr(request, key), enum.Enum) else getattr(request, key) - for key in ['id', 'entity_info', 'shipping_latitude', 'shipping_longitude', 'status'] + for key in ['id', 'entity_info', 'shipping_latitude', 'shipping_longitude', 'status', 'handling_orga'] } - for request in FaceshieldRequest.query.filter(FaceshieldRequest.shipping_latitude != None) + for request in FaceshieldRequest.query.filter(FaceshieldRequest.shipping_latitude != None, FaceshieldRequest.status != Status.spam, FaceshieldRequest.status != Status.rejected) ] return self.render('admin_map.html', mapdata=mapdata)