Merge pull request #2843 from bookwyrm-social/user-reports-link

Show all (not just open) reports when linked from user admin
bookwyrm-social · May 15, 2023 · 24d5931 · 24d5931
2 parents d6a321d + 0e0d9d2
commit 24d5931
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/bookwyrm/templates/settings/reports/reports.html b/bookwyrm/templates/settings/reports/reports.html
@@ -21,10 +21,10 @@
 {% block panel %}
 <div class="tabs">
     <ul>
-        <li class="{% if not resolved %}is-active{% endif %}"{% if not resolved == 'open' %} aria-current="page"{% endif %}>
+        <li class="{% if not resolved %}is-active{% endif %}"{% if not resolved %} aria-current="page"{% endif %}>
             <a href="{% url 'settings-reports' %}?resolved=false">{% trans "Open" %}</a>
         </li>
-        <li class="{% if resolved %}is-active{% endif %}"{% if resolved %} aria-current="page"{% endif %}>
+        <li class="{% if resolved and resolved != "all" %}is-active{% endif %}"{% if resolved and resolved != "all" %} aria-current="page"{% endif %}>
             <a href="{% url 'settings-reports' %}?resolved=true">{% trans "Resolved" %}</a>
         </li>
     </ul>

diff --git a/bookwyrm/templates/settings/users/user_info.html b/bookwyrm/templates/settings/users/user_info.html
@@ -61,7 +61,7 @@ <h4 class="title is-4">{% trans "User details" %}</h4>
                 <dd>
                     {{ report_count|intcomma }}
                     {% if report_count > 0 %}
-                    <a href="{% url 'settings-reports' %}?username={{ user.username }}">
+                    <a href="{% url 'settings-reports' %}?username={{ user.username }}&resolved=all">
                         {% trans "(View reports)" %}
                     </a>
                     {% endif %}

diff --git a/bookwyrm/tests/validate_html.py b/bookwyrm/tests/validate_html.py
@@ -18,6 +18,7 @@ def validate_html(html):
         for e in errors.split("\n")
         if "&book" not in e
         and "&type" not in e
+        and "&resolved" not in e
         and "id and name attribute" not in e
         and "illegal characters found in URI" not in e
         and "escaping malformed URI reference" not in e

diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py
@@ -29,14 +29,20 @@ def get(self, request):
         """view current reports"""
         filters = {}
 
-        resolved = request.GET.get("resolved") == "true"
+        # we sometimes want to see all reports, regardless of resolution
+        if request.GET.get("resolved") == "all":
+            resolved = "all"
+        else:
+            resolved = request.GET.get("resolved") == "true"
+
         server = request.GET.get("server")
         if server:
             filters["user__federated_server__server_name"] = server
         username = request.GET.get("username")
         if username:
             filters["user__username__icontains"] = username
-        filters["resolved"] = resolved
+        if resolved != "all":
+            filters["resolved"] = resolved
 
         reports = models.Report.objects.filter(**filters)
         paginated = Paginator(reports, PAGE_LENGTH)