diff --git a/app/domain/routes.py b/app/domain/routes.py index db00d930..c8715a5a 100644 --- a/app/domain/routes.py +++ b/app/domain/routes.py @@ -56,7 +56,7 @@ def domains(): page = request.args.get('page', 1, type=int) search = request.args.get('search', '') - domains = Domain.query.filter_by(banned=False) + domains = Domain.query#.filter_by(banned=False) if search != '': domains = domains.filter(Domain.name.ilike(f'%{search}%')) domains = domains.order_by(Domain.name) diff --git a/app/templates/domain/domains.html b/app/templates/domain/domains.html index a7345f1d..754e72c7 100644 --- a/app/templates/domain/domains.html +++ b/app/templates/domain/domains.html @@ -6,6 +6,7 @@ {% from 'bootstrap/form.html' import render_form %} {% block app_content %} +
+ + + {% if search == '' %}

{{ _('All known domains') }}

{% else %}

{{ _('Domains containing %(search)s', search=search) }}

{% endif %}
+ - + + + + + + + {% for domain in domains %} - + + + + - - - {% for domain in domains %} - - - - {% endfor %} - + {% endfor %}
Domain# PostsStatusActions
{{ _('Domain') }}{{ domain.name }}{{ domain.post_count }}{{ 'Banned'|safe if domain.banned else 'Allowed'|safe }} + {% if domain.blocked_by(current_user) %} + {{ _('Unblock') }} + {% else %} + {{ _('Block') }} + {% endif %} + {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %} + {% if domain.banned %} + {{ _('Unban') }} + {% else %} + {{ _('Ban') }} + {% endif %} + {% endif %} +
{{ domain.name }}
- - -
-
- -
{% endblock %} +