zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge pull request #953 from bookwyrm-social/admin-filters

Browse source 
Filter reports and users by server name and username
This commit is contained in:
Mouse Reeve 2021-04-17 11:26:12 -07:00 • committed by GitHub
commit 45cf1cd7a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/templates/moderation/reports.html
View file

@ -8,6 +8,7 @@
{% trans "Reports" %}
{% endif %}
{% endblock %}
{% block header %}
{% if server %}
{% blocktrans with server_name=server.server_name %}Reports: <small>{{ server_name }}</small>{% endblocktrans %}
@ -29,6 +30,8 @@
</ul>
</div>
{% include 'settings/user_admin_filters.html' %}
<div class="block">
{% if not reports %}
<em>{% trans "No reports found." %}</em>

4
bookwyrm/templates/settings/federated_server.html
View file

@ -39,14 +39,14 @@
<dt>{% trans "Users:" %}</dt>
<dd>
{{ users.count }}
{% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
{% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
</dd>
</div>
<div class="is-flex">
<dt>{% trans "Reports:" %}</dt>
<dd>
{{ reports.count }}
{% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
{% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
</dd>
</div>
<div class="is-flex">

7
bookwyrm/templates/settings/server_filter.html Normal file
View file

@ -0,0 +1,7 @@
{% extends 'snippets/filters_panel/filter_field.html' %}
{% load i18n %}
{% block filter %}
<label class="label" for="id_server">{% trans "Server name" %}</label>
<input type="text" class="input" name="server" value="{{ request.GET.server|default:'' }}" id="id_server" placeholder="example.server.com">
{% endblock %}

2
bookwyrm/templates/settings/user_admin.html
View file

@ -13,6 +13,8 @@
{% block panel %}
{% include 'settings/user_admin_filters.html' %}
<table class="table is-striped">
<tr>
{% url 'settings-users' as url %}

6
bookwyrm/templates/settings/user_admin_filters.html Normal file
View file

@ -0,0 +1,6 @@
{% extends 'snippets/filters_panel/filters_panel.html' %}
{% block filter_fields %}
{% include 'settings/server_filter.html' %}
{% include 'settings/username_filter.html' %}
{% endblock %}

8
bookwyrm/templates/settings/username_filter.html Normal file
View file

@ -0,0 +1,8 @@
{% extends 'snippets/filters_panel/filter_field.html' %}
{% load i18n %}
{% block filter %}
<label class="label" for="id_username">{% trans "Username" %}</label>
<input type="text" class="input" name="username" value="{{ request.GET.username|default:'' }}" id="id_username" placeholder="user@domain.com">
{% endblock %}