michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-03 00:31:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
rimu 2024-08-20 08:55:18 +12:00
commit 918b6eb742
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/admin/routes.py
View file

@ -246,14 +246,18 @@ def admin_activities():
page = request.args.get('page', 1, type=int)
result_filter = request.args.get('result', type=str)
direction_filter = request.args.get('direction', type=str)
activities = ActivityPubLog.query.order_by(desc(ActivityPubLog.created_at))
if result_filter:
activities = ActivityPubLog.query.order_by(desc(ActivityPubLog.created_at)).filter(ActivityPubLog.result == result_filter).paginate(page=page, per_page=1000, error_out=False)
else:
activities = ActivityPubLog.query.order_by(desc(ActivityPubLog.created_at)).paginate(page=page, per_page=1000, error_out=False)
activities = activities.filter(ActivityPubLog.result == result_filter)
if direction_filter:
activities = activities.filter(ActivityPubLog.direction == direction_filter)
next_url = url_for('admin.admin_activities', page=activities.next_num, result=result_filter) if activities.has_next else None
prev_url = url_for('admin.admin_activities', page=activities.prev_num, result=result_filter) if activities.has_prev and page != 1 else None
activities = activities.paginate(page=page, per_page=1000, error_out=False)
next_url = url_for('admin.admin_activities', page=activities.next_num, result=result_filter, direction=direction_filter) if activities.has_next else None
prev_url = url_for('admin.admin_activities', page=activities.prev_num, result=result_filter, direction=direction_filter) if activities.has_prev and page != 1 else None
return render_template('admin/activities.html', title=_('ActivityPub Log'), next_url=next_url, prev_url=prev_url,
activities=activities,

14
app/templates/admin/activities.html
View file

@ -11,11 +11,15 @@
<div class="col">
<h1>{{ _('Activities') }}</h1>
Result Filter:
<a href="{{ url_for('admin.admin_activities') }}">All</a> |
<a href="{{ url_for('admin.admin_activities', result='failure') }}">Failure</a> |
<a href="{{ url_for('admin.admin_activities', result='success') }}">Success</a> |
<a href="{{ url_for('admin.admin_activities', result='ignored') }}">Ignored</a> |
<a href="{{ url_for('admin.admin_activities', result='processing') }}">Processing</a>
<a href="{{ url_for('admin.admin_activities', direction=request.args.get('direction')) }}">All</a> |
<a href="{{ url_for('admin.admin_activities', result='failure', direction=request.args.get('direction')) }}">Failure</a> |
<a href="{{ url_for('admin.admin_activities', result='success', direction=request.args.get('direction')) }}">Success</a> |
<a href="{{ url_for('admin.admin_activities', result='ignored', direction=request.args.get('direction')) }}">Ignored</a> |
<a href="{{ url_for('admin.admin_activities', result='processing', direction=request.args.get('direction')) }}">Processing</a> ---
Direction Filter:
<a href="{{ url_for('admin.admin_activities', result=request.args.get('result')) }}">Both</a> |
<a href="{{ url_for('admin.admin_activities', result=request.args.get('result'), direction='in') }}">In</a> |
<a href="{{ url_for('admin.admin_activities', result=request.args.get('result'), direction='out') }}">Out</a>
<table class="table">
<tr>
<th>When</th>