yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes admin permissions

Browse Source
This commit is contained in:
Mouse Reeve 2021-08-29 08:14:53 -07:00
parent 05e5db177d
commit 76ba56f656
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bookwyrm/templates/layout.html
View File

@ -109,17 +109,17 @@
{% trans 'Settings' %} {% trans 'Settings' %}
</a> </a>
</li> </li>
{% if perms.bookwyrm.create_invites or perms.moderate_users %} {% if perms.bookwyrm.create_invites or perms.moderate_user %}
<li class="navbar-divider" role="presentation"></li> <li class="navbar-divider" role="presentation"></li>
{% endif %} {% endif %}
{% if perms.bookwyrm.create_invites %} {% if perms.bookwyrm.create_invites and not site.allow_registration %}
<li> <li>
<a href="{% url 'settings-invite-requests' %}" class="navbar-item"> <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
{% trans 'Invites' %} {% trans 'Invites' %}
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% if perms.bookwyrm.moderate_users %} {% if perms.bookwyrm.moderate_user %}
<li> <li>
<a href="{% url 'settings-users' %}" class="navbar-item"> <a href="{% url 'settings-users' %}" class="navbar-item">
{% trans 'Admin' %} {% trans 'Admin' %}

6
bookwyrm/templates/settings/admin_layout.html
View File

@ -21,23 +21,29 @@
{% if perms.bookwyrm.create_invites %} {% if perms.bookwyrm.create_invites %}
<h2 class="menu-label">{% trans "Manage Users" %}</h2> <h2 class="menu-label">{% trans "Manage Users" %}</h2>
<ul class="menu-list"> <ul class="menu-list">
{% if perms.bookwyrm.moderate_user %}
<li> <li>
{% url 'settings-users' as url %} {% url 'settings-users' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Users" %}</a> <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Users" %}</a>
</li> </li>
{% endif %}
<li> <li>
{% url 'settings-invite-requests' as url %} {% url 'settings-invite-requests' as url %}
{% url 'settings-invites' as alt_url %} {% url 'settings-invites' as alt_url %}
<a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a> <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
</li> </li>
{% if perms.bookwyrm.moderate_user %}
<li> <li>
{% url 'settings-reports' as url %} {% url 'settings-reports' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a> <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
</li> </li>
{% endif %}
{% if perms.bookwyrm.control_federation %}
<li> <li>
{% url 'settings-federation' as url %} {% url 'settings-federation' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a> <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a>
</li> </li>
{% endif %}
</ul> </ul>
{% endif %} {% endif %}
{% if perms.bookwyrm.edit_instance_settings %} {% if perms.bookwyrm.edit_instance_settings %}

2
bookwyrm/views/user_admin.py
View File

@ -13,7 +13,7 @@ from bookwyrm.settings import PAGE_LENGTH
# pylint: disable= no-self-use # pylint: disable= no-self-use
@method_decorator(login_required, name="dispatch") @method_decorator(login_required, name="dispatch")
@method_decorator( @method_decorator(
permission_required("bookwyrm.moderate_users", raise_exception=True), permission_required("bookwyrm.moderate_user", raise_exception=True),
name="dispatch", name="dispatch",
) )
class UserAdminList(View): class UserAdminList(View):