mirror of
https://codeberg.org/rimu/pyfedi
synced 2025-01-23 19:36:56 -08:00
remove admin_users_trash in favor of the new admin_users sorting capability
This commit is contained in:
Hendrik L
parent
5e911b4853
commit
d4ff1f924f
4 changed files with 0 additions and 114 deletions
|
|
@ -1178,45 +1178,6 @@ def admin_users():
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@bp.route('/users/trash', methods=['GET'])
|
|
||||||
@login_required
|
|
||||||
@permission_required('administer all users')
|
|
||||||
def admin_users_trash():
|
|
||||||
|
|
||||||
page = request.args.get('page', 1, type=int)
|
|
||||||
search = request.args.get('search', '')
|
|
||||||
local_remote = request.args.get('local_remote', '')
|
|
||||||
type = request.args.get('type', 'bad_rep')
|
|
||||||
|
|
||||||
users = User.query.filter_by(deleted=False)
|
|
||||||
if local_remote == 'local':
|
|
||||||
users = users.filter_by(ap_id=None)
|
|
||||||
if local_remote == 'remote':
|
|
||||||
users = users.filter(User.ap_id != None)
|
|
||||||
if search:
|
|
||||||
users = users.filter(User.email.ilike(f"%{search}%"))
|
|
||||||
|
|
||||||
if type == '' or type == 'bad_rep':
|
|
||||||
users = users.filter(User.last_seen > utcnow() - timedelta(days=7))
|
|
||||||
users = users.filter(User.reputation < -10)
|
|
||||||
users = users.order_by(User.reputation).paginate(page=page, per_page=1000, error_out=False)
|
|
||||||
elif type == 'bad_attitude':
|
|
||||||
users = users.filter(User.last_seen > utcnow() - timedelta(days=7))
|
|
||||||
users = users.filter(User.attitude < 0.0).filter(User.reputation < -10)
|
|
||||||
users = users.order_by(User.attitude).paginate(page=page, per_page=1000, error_out=False)
|
|
||||||
|
|
||||||
next_url = url_for('admin.admin_users_trash', page=users.next_num, search=search, local_remote=local_remote, type=type) if users.has_next else None
|
|
||||||
prev_url = url_for('admin.admin_users_trash', page=users.prev_num, search=search, local_remote=local_remote, type=type) if users.has_prev and page != 1 else None
|
|
||||||
|
|
||||||
return render_template('admin/users_trash.html', title=_('Problematic users'), next_url=next_url, prev_url=prev_url, users=users,
|
|
||||||
local_remote=local_remote, search=search, type=type,
|
|
||||||
moderating_communities=moderating_communities(current_user.get_id()),
|
|
||||||
joined_communities=joined_communities(current_user.get_id()),
|
|
||||||
menu_topics=menu_topics(),
|
|
||||||
site=g.site
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@bp.route('/content/trash', methods=['GET'])
|
@bp.route('/content/trash', methods=['GET'])
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('administer all users')
|
@permission_required('administer all users')
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
<a href="{{ url_for('admin.admin_communities') }}">{{ _('Communities') }}</a> |
|
<a href="{{ url_for('admin.admin_communities') }}">{{ _('Communities') }}</a> |
|
||||||
<a href="{{ url_for('admin.admin_topics') }}">{{ _('Topics') }}</a> |
|
<a href="{{ url_for('admin.admin_topics') }}">{{ _('Topics') }}</a> |
|
||||||
<a href="{{ url_for('admin.admin_users', local_remote='local') }}">{{ _('Users') }}</a> |
|
<a href="{{ url_for('admin.admin_users', local_remote='local') }}">{{ _('Users') }}</a> |
|
||||||
<a href="{{ url_for('admin.admin_users_trash', local_remote='local') }}">{{ _('Watch') }}</a> |
|
|
||||||
{% if site.registration_mode == 'RequireApplication' %}
|
{% if site.registration_mode == 'RequireApplication' %}
|
||||||
<a href="{{ url_for('admin.admin_approve_registrations') }}">{{ _('Registration applications') }}</a> |
|
<a href="{{ url_for('admin.admin_approve_registrations') }}">{{ _('Registration applications') }}</a> |
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
|
|
||||||
{% extends 'themes/' + theme() + '/base.html' %}
|
|
||||||
{% else %}
|
|
||||||
{% extends "base.html" %}
|
|
||||||
{% endif %}
|
|
||||||
{% from 'bootstrap/form.html' import render_form %}
|
|
||||||
{% set active_child = 'admin_users_trash' %}
|
|
||||||
|
|
||||||
{% block app_content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<h1>{{ _('Users') }}</h1>
|
|
||||||
<a class="btn btn-primary" href="{{ url_for('admin.admin_users_add') }}" style="float: right;">{{ _('Add local user') }}</a>
|
|
||||||
<form method="get">
|
|
||||||
<input type="search" name="search" value="{{ search }}">
|
|
||||||
<input type="radio" name="local_remote" value="local" id="local_remote_local" {{ 'checked' if local_remote == 'local' }}><label for="local_remote_local"> Local</label>
|
|
||||||
<input type="radio" name="local_remote" value="remote" id="local_remote_remote" {{ 'checked' if local_remote == 'remote' }}><label for="local_remote_remote"> Remote</label>
|
|
||||||
<input type="radio" name="type" value="bad_rep" id="type_bad_rep" {{ 'checked' if type == 'bad_rep' }}><label for="type_bad_rep"> Bad rep</label>
|
|
||||||
<input type="radio" name="type" value="bad_attitude" id="type_bad_attitude" {{ 'checked' if type == 'bad_attitude' }}><label for="type_bad_attitude"> Bad attitude</label>
|
|
||||||
<input type="submit" name="submit" value="Search" class="btn btn-primary">
|
|
||||||
</form>
|
|
||||||
<table class="table table-striped mt-1">
|
|
||||||
<tr>
|
|
||||||
<th>Name</th>
|
|
||||||
<th>Seen</th>
|
|
||||||
<th>Attitude</th>
|
|
||||||
<th>Rep</th>
|
|
||||||
<th>Banned</th>
|
|
||||||
<th>Reports</th>
|
|
||||||
<th>Actions</th>
|
|
||||||
</tr>
|
|
||||||
{% for user in users.items %}
|
|
||||||
<tr>
|
|
||||||
<td>{{ render_username(user, add_domain=False) }}<br />
|
|
||||||
<a href="/u/{{ user.link() }}">{{ user.user_name }}</a>{% if not user.is_local() %}<wbr />@<a href="{{ user.ap_profile_id }}">{{ user.ap_domain }}</a>{% endif %}</td>
|
|
||||||
<td>{% if request.args.get('local_remote', '') == 'local' %}
|
|
||||||
{{ arrow.get(user.last_seen).humanize(locale=locale) }}
|
|
||||||
{% else %}
|
|
||||||
{{ user.last_seen }}
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
<td>{% if user.attitude != 1 %}{{ (user.attitude * 100) | round | int }}%{% endif %}</td>
|
|
||||||
<td>{% if user.reputation %}R {{ user.reputation | round | int }}{% endif %}</td>
|
|
||||||
<td>{{ '<span class="red">Banned</span>'|safe if user.banned }} </td>
|
|
||||||
<td>{{ user.reports if user.reports > 0 }} </td>
|
|
||||||
<td><a href="{{ url_for('admin.admin_user_edit', user_id=user.id) }}">Edit</a> |
|
|
||||||
<a href="{{ url_for('admin.admin_user_delete', user_id=user.id) }}" class="confirm_first">Delete</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
<nav aria-label="Pagination" class="mt-4" role="navigation">
|
|
||||||
{% if prev_url %}
|
|
||||||
<a href="{{ prev_url }}" class="btn btn-primary">
|
|
||||||
<span aria-hidden="true">←</span> {{ _('Previous page') }}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
{% if next_url %}
|
|
||||||
<a href="{{ next_url }}" class="btn btn-primary">
|
|
||||||
{{ _('Next page') }} <span aria-hidden="true">→</span>
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
{% include 'admin/_nav.html' %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr />
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -217,7 +217,6 @@
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_communities' }}" href="{{ url_for('admin.admin_communities') }}">{{ _('Communities') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_communities' }}" href="{{ url_for('admin.admin_communities') }}">{{ _('Communities') }}</a></li>
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_topics' }}" href="{{ url_for('admin.admin_topics') }}">{{ _('Topics') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_topics' }}" href="{{ url_for('admin.admin_topics') }}">{{ _('Topics') }}</a></li>
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_users' }}" href="{{ url_for('admin.admin_users', local_remote='local') }}">{{ _('Users') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_users' }}" href="{{ url_for('admin.admin_users', local_remote='local') }}">{{ _('Users') }}</a></li>
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_users_trash' }}" href="{{ url_for('admin.admin_users_trash', local_remote='local') }}">{{ _('Monitoring - users') }}</a></li>
|
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_trash' }}" href="{{ url_for('admin.admin_content_trash') }}">{{ _('Monitoring - content') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_trash' }}" href="{{ url_for('admin.admin_content_trash') }}">{{ _('Monitoring - content') }}</a></li>
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_spam' }}" href="{{ url_for('admin.admin_content_spam') }}">{{ _('Monitoring - spammy content') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_spam' }}" href="{{ url_for('admin.admin_content_spam') }}">{{ _('Monitoring - spammy content') }}</a></li>
|
||||||
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_deleted' }}" href="{{ url_for('admin.admin_content_deleted') }}">{{ _('Deleted content') }}</a></li>
|
<li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_deleted' }}" href="{{ url_for('admin.admin_content_deleted') }}">{{ _('Deleted content') }}</a></li>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue