Merge branch 'main' into production

bookwyrm/templates/settings/reports/reports.html

@@ -44,5 +44,6 @@
     {% endfor %}
 </div>
 
+{% include 'snippets/pagination.html' with page=reports path=request.path %}
 {% endblock %}
 

bookwyrm/templates/settings/users/user_admin.html

@@ -61,10 +61,25 @@
         </tr>
         {% for user in users %}
         <tr>
-            <td><a href="{% url 'settings-user' user.id %}">{{ user|username }}</a></td>
+            <td class="overflow-wrap-anywhere">
+                <a href="{% url 'settings-user' user.id %}">{{ user|username }}</a>
+            </td>
             <td>{{ user.created_date }}</td>
             <td>{{ user.last_active_date }}</td>
-            <td>{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</td>
+            <td>
+                {% if user.is_active %}
+                    <span class="tag is-success" aria-hidden="true">
+                        <span class="icon icon-check"></span>
+                    </span>
+                    {% trans "Active" %}
+                {% else %}
+                    <span class="tag is-warning" aria-hidden="true">
+                        <span class="icon icon-x"></span>
+                    </span>
+                    {% trans "Inactive" %}
+                    <span class="help">({{ user.get_deactivation_reason_display }})</span>
+                {% endif %}
+            </td>
             {% if status != "local" %}
             <td>
                 {% if user.federated_server %}

bookwyrm/templates/settings/users/user_info.html

@@ -6,7 +6,7 @@
     <div class="column is-flex is-flex-direction-column">
         <h4 class="title is-4">{% trans "Profile" %}</h4>
         <div class="box is-flex-grow-1">
-            {% include 'user/user_preview.html' with user=user %}
+            {% include 'user/user_preview.html' with user=user admin_mode=True %}
             {% if user.summary %}
             <div class="box content has-background-secondary is-shadowless">
                 {{ user.summary|to_markdown|safe }}
@@ -14,6 +14,10 @@
             {% endif %}
 
             <p class="mt-2"><a href="{{ user.local_path }}">{% trans "View user profile" %}</a></p>
+            {% url 'settings-user' user.id as url %}
+            {% if not request.path == url %}
+            <p class="mt-2"><a href="{{ url }}">{% trans "Go to user admin" %}</a></p>
+            {% endif %}
         </div>
     </div>
     <div class="column is-flex is-flex-direction-column is-4">
@@ -67,6 +71,9 @@
                 <dt class="is-pulled-left mr-5">{% trans "Blocked by count:" %}</dt>
                 <dd>{{ user.blocked_by.count }}</dd>
 
+                <dt class="is-pulled-left mr-5">{% trans "Date added:" %}</dt>
+                <dd>{{ user.created_date }}</dd>
+
                 <dt class="is-pulled-left mr-5">{% trans "Last active date:" %}</dt>
                 <dd>{{ user.last_active_date }}</dd>
 

bookwyrm/templates/user/user_preview.html

@@ -21,7 +21,7 @@
         <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
         <p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
         <p>
-            {% if request.user.id == user.id %}
+            {% if request.user.id == user.id or admin_mode %}
 
                 <a href="{% url 'user-followers' user|username %}">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
                 <a href="{% url 'user-following' user|username %}">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>

bookwyrm/views/admin/reports.py

@@ -1,5 +1,6 @@
 """ moderation via flagged posts and users """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -7,6 +8,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
+from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable=no-self-use
@@ -34,10 +36,17 @@ class ReportsAdmin(View):
         if username:
             filters["user__username__icontains"] = username
         filters["resolved"] = resolved
+
+        reports = models.Report.objects.filter(**filters)
+        paginated = Paginator(reports, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "resolved": resolved,
             "server": server,
-            "reports": models.Report.objects.filter(**filters),
+            "reports": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
         }
         return TemplateResponse(request, "settings/reports/reports.html", data)