sb745/NyaaV3
1
0
Fork 0
mirror of https://github.com/sb745/NyaaV3.git synced 2025-03-12 22:06:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix uncommon exception in report system

Browse source 
fix html style issue in admin box on user page
This commit is contained in:
nyaadev 2018-02-06 23:05:37 +01:00
parent e5fe63156d
commit 658eefe42a
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nyaa/templates/user.html
View file

@ -104,21 +104,21 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 text-left"> <div class="col-md-3 text-left">
{% if not user.is_banned %} {% if not user.is_banned %}
{{ ban_form.ban_user(value="Ban User", class="btn btn-danger") }} {{ ban_form.ban_user(value="Ban User", class="btn btn-danger") }}
{% else %} {% else %}
<button type="button" class="btn btn-danger disabled">Already banned</button> <button type="button" class="btn btn-danger disabled">Already banned</button>
{% endif %} {% endif %}
</div> </div>
<div class="col-md-4 text-center"> <div class="col-md-3 text-center">
{% if not ipbanned %} {% if not ipbanned %}
{{ ban_form.ban_userip(value="Ban User+IP", class="btn btn-danger") }} {{ ban_form.ban_userip(value="Ban User+IP", class="btn btn-danger") }}
{% else %} {% else %}
<button type="button" class="btn btn-danger disabled">Already IP banned</button> <button type="button" class="btn btn-danger disabled">Already IP banned</button>
{% endif %} {% endif %}
</div> </div>
<div class="col-md-4 text-right"> <div class="col-md-6 text-right">
{% if g.user.is_superadmin %} {% if g.user.is_superadmin %}
{{ ban_form.nuke(value="\U0001F4A3 Nuke Torrents", class="btn btn-danger") }} {{ ban_form.nuke(value="\U0001F4A3 Nuke Torrents", class="btn btn-danger") }}
{% else %} {% else %}

56
nyaa/views/admin.py
View file

@ -76,40 +76,40 @@ def view_reports():
report_id = report_action.report.data report_id = report_action.report.data
torrent = models.Torrent.by_id(torrent_id) torrent = models.Torrent.by_id(torrent_id)
report = models.Report.by_id(report_id) report = models.Report.by_id(report_id)
report_user = models.User.by_id(report.user_id)
if not torrent or not report or report.status != 0: if not torrent or not report or report.status != 0:
flask.abort(404) flask.abort(404)
report_user = models.User.by_id(report.user_id)
log = 'Report #{}: {} [#{}]({}), reported by [{}]({})'
if action == 'delete':
torrent.deleted = True
report.status = 1
log = log.format(report_id, 'Deleted', torrent_id,
flask.url_for('torrents.view', torrent_id=torrent_id),
report_user.username,
flask.url_for('users.view_user', user_name=report_user.username))
elif action == 'hide':
log = log.format(report_id, 'Hid', torrent_id,
flask.url_for('torrents.view', torrent_id=torrent_id),
report_user.username,
flask.url_for('users.view_user', user_name=report_user.username))
torrent.hidden = True
report.status = 1
else: else:
log = 'Report #{}: {} [#{}]({}), reported by [{}]({})' log = log.format(report_id, 'Closed', torrent_id,
if action == 'delete': flask.url_for('torrents.view', torrent_id=torrent_id),
torrent.deleted = True report_user.username,
report.status = 1 flask.url_for('users.view_user', user_name=report_user.username))
log = log.format(report_id, 'Deleted', torrent_id, report.status = 2
flask.url_for('torrents.view', torrent_id=torrent_id),
report_user.username,
flask.url_for('users.view_user', user_name=report_user.username))
elif action == 'hide':
log = log.format(report_id, 'Hid', torrent_id,
flask.url_for('torrents.view', torrent_id=torrent_id),
report_user.username,
flask.url_for('users.view_user', user_name=report_user.username))
torrent.hidden = True
report.status = 1
else:
log = log.format(report_id, 'Closed', torrent_id,
flask.url_for('torrents.view', torrent_id=torrent_id),
report_user.username,
flask.url_for('users.view_user', user_name=report_user.username))
report.status = 2
adminlog = models.AdminLog(log=log, admin_id=flask.g.user.id) adminlog = models.AdminLog(log=log, admin_id=flask.g.user.id)
db.session.add(adminlog) db.session.add(adminlog)
models.Report.remove_reviewed(torrent_id) models.Report.remove_reviewed(torrent_id)
db.session.commit() db.session.commit()
flask.flash('Closed report #{}'.format(report.id), 'success') flask.flash('Closed report #{}'.format(report.id), 'success')
return flask.redirect(flask.url_for('admin.reports')) return flask.redirect(flask.url_for('admin.reports'))
return flask.render_template('reports.html', return flask.render_template('reports.html',
reports=reports, reports=reports,