diff --git a/app/domain/routes.py b/app/domain/routes.py index 54a74a38..84d5c055 100644 --- a/app/domain/routes.py +++ b/app/domain/routes.py @@ -8,7 +8,7 @@ from app import db, constants, cache from app.inoculation import inoculation from app.models import Post, Domain, Community, DomainBlock from app.domain import bp -from app.utils import get_setting, render_template, permission_required, joined_communities, moderating_communities, \ +from app.utils import render_template, permission_required, joined_communities, moderating_communities, \ user_filters_posts, blocked_domains from sqlalchemy import desc @@ -77,7 +77,7 @@ def domains(): @bp.route('/domains/banned', methods=['GET']) @login_required -def blocked_domains(): +def domains_blocked_list(): if not current_user.trustworthy(): abort(404) diff --git a/app/templates/domain/domains.html b/app/templates/domain/domains.html index e6fcd163..4eac8579 100644 --- a/app/templates/domain/domains.html +++ b/app/templates/domain/domains.html @@ -35,20 +35,12 @@ - - {% if not current_user.is_anonymous %}{% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}{%endif%}{%endif%} + {% for domain in domains %} - {% if not current_user.is_anonymous %} - {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %} - - {% endif %} - {% endif %} {% endfor %}
Domain# PostsActions# Posts
{{ domain.name }} {{ domain.post_count }} - {{ _('Ban') }} -
diff --git a/app/templates/domain/domains_blocked.html b/app/templates/domain/domains_blocked.html index 9bb9f1ca..460b203e 100644 --- a/app/templates/domain/domains_blocked.html +++ b/app/templates/domain/domains_blocked.html @@ -35,7 +35,7 @@ - {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}{%endif%} + {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}{% endif %} {% for domain in domains %}
DomainActionsActions