diff --git a/app/admin/routes.py b/app/admin/routes.py index d4297500..2a58375c 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -1182,7 +1182,7 @@ def admin_users(): if last_seen > 0: users = users.filter(User.last_seen > utcnow() - timedelta(days=last_seen)) users = users.order_by(text('"user".' + sort_by)) - users = users.paginate(page=page, per_page=1000, error_out=False) + users = users.paginate(page=page, per_page=500, error_out=False) next_url = url_for('admin.admin_users', page=users.next_num, search=search, local_remote=local_remote, sort_by=sort_by, last_seen=last_seen) if users.has_next else None prev_url = url_for('admin.admin_users', page=users.prev_num, search=search, local_remote=local_remote, sort_by=sort_by, last_seen=last_seen) if users.has_prev and page != 1 else None diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html index 7b5e93c9..02c92913 100644 --- a/app/templates/admin/users.html +++ b/app/templates/admin/users.html @@ -76,18 +76,12 @@ {% for user in users.items %} - {{ render_username(user, add_domain=False) }}
- {{ user.user_name }}{% if not user.is_local() %}@{{ user.ap_domain }}{% endif %}
+ {{ render_username(user) }} {{ 'Banned'|safe if user.banned }} {{ 'Banned posts'|safe if user.ban_posts }} - {{ 'Banned comments'|safe if user.ban_comments }} - {{ user.reports if user.reports > 0 }} - {% if user.attitude %}{{ (user.attitude * 100) | round | int }}%{% endif %} - {% if user.reputation %}R {{ user.reputation | round | int }}{% endif %} - {{ arrow.get(user.last_seen).humanize(locale=locale) }} {{ 'Banned comments'|safe if user.ban_comments }} + {{ arrow.get(user.last_seen).humanize(locale=locale) }} {{ user.reports if user.reports > 0 }} - {% if user.attitude != 1 %}{{ (user.attitude * 100) | round | int }}%{% endif %} {% if user.reputation %}R {{ user.reputation | round | int }}{% endif %} {{ arrow.get(user.last_seen).humanize(locale=locale) }} Edit,