mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-26 03:21:05 +00:00
Adds invite request filters
This commit is contained in:
parent
8039917b89
commit
b62989b5a8
2 changed files with 26 additions and 1 deletions
|
@ -26,6 +26,8 @@
|
||||||
{% endif %} ({{ count }})
|
{% endif %} ({{ count }})
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
|
{% include 'settings/invite_request_filters.html' %}
|
||||||
|
|
||||||
<table class="table is-striped">
|
<table class="table is-striped">
|
||||||
{% url 'settings-invite-requests' as url %}
|
{% url 'settings-invite-requests' as url %}
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
""" invites when registration is closed """
|
""" invites when registration is closed """
|
||||||
|
from functools import reduce
|
||||||
|
import operator
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
from django.contrib.auth.decorators import login_required, permission_required
|
from django.contrib.auth.decorators import login_required, permission_required
|
||||||
from django.core.paginator import Paginator
|
from django.core.paginator import Paginator
|
||||||
|
from django.db.models import Q
|
||||||
from django.http import HttpResponseBadRequest
|
from django.http import HttpResponseBadRequest
|
||||||
from django.shortcuts import get_object_or_404, redirect
|
from django.shortcuts import get_object_or_404, redirect
|
||||||
from django.template.response import TemplateResponse
|
from django.template.response import TemplateResponse
|
||||||
|
@ -100,8 +103,28 @@ class ManageInviteRequests(View):
|
||||||
if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
|
if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
|
||||||
sort = "-created_date"
|
sort = "-created_date"
|
||||||
|
|
||||||
|
requests = models.InviteRequest.objects.filter(ignored=ignored).order_by(sort)
|
||||||
|
|
||||||
|
status_filters = [
|
||||||
|
s
|
||||||
|
for s in request.GET.getlist("status")
|
||||||
|
if s in ["requested", "sent", "accepted"]
|
||||||
|
]
|
||||||
|
|
||||||
|
filters = []
|
||||||
|
if "requested" in status_filters:
|
||||||
|
filters.append({"invite__isnull": True})
|
||||||
|
if "sent" in status_filters:
|
||||||
|
filters.append({"invite__isnull": False})
|
||||||
|
if "accepted" in status_filters:
|
||||||
|
filters.append({"invite__isnull": False, "invite__times_used__gte": 1})
|
||||||
|
|
||||||
|
requests = requests.filter(
|
||||||
|
reduce(operator.or_, (Q(**f) for f in filters))
|
||||||
|
).distinct()
|
||||||
|
|
||||||
paginated = Paginator(
|
paginated = Paginator(
|
||||||
models.InviteRequest.objects.filter(ignored=ignored).order_by(sort),
|
requests,
|
||||||
PAGE_LENGTH,
|
PAGE_LENGTH,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue