hswaw/kasownik
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some minor leftovers

Browse source
This commit is contained in:
Kasownik 2023-04-21 20:18:55 +02:00
parent af58b41cbd
commit 75aaaa98e7
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
web/webapp/admin.py
View file

@ -30,9 +30,6 @@ def index():
member['color'] = "FF0000"
active_members = list(filter(lambda m: m['judgement'], members))
inactive_members = list(filter(lambda m: not m['judgement'], members))
diff = directory.get_ldap_group_diff(members)
if diff is not None:
flash("LDAP sync required")
return render_template("admin_index.html",
active_members=active_members,
inactive_members=inactive_members,
@ -120,7 +117,7 @@ def admin_member_set_policy(membername, policy):
member.payment_policy = models.PaymentPolicy[policy].value
db.session.add(member)
db.session.commit()
return redirect(request.referrer)
return redirect(request.referrer or url_for('.admin_member', membername=membername))
@bp.route("/admin/member/<membername>/membership:<membershiptype>")
@login_required
@ -130,7 +127,7 @@ def admin_member_set_membership(membername, membershiptype):
member.type = models.MembershipType[membershiptype].name
db.session.add(member)
db.session.commit()
return redirect(request.referrer)
return redirect(request.referrer or url_for('.admin_member', membername=membername))
@bp.route("/admin/member/add/<membershiptype>/<username>")
@ -141,7 +138,7 @@ def add_member(membershiptype, username):
db.session.add(member)
db.session.commit()
flash('Member created')
return redirect(request.referrer)
return redirect(request.referrer or url_for('.match_manual'))
@bp.route("/admin/match")
@login_required

4
web/webapp/templates/button_membership_type.html
View file

@ -7,8 +7,8 @@
{{member.type|capitalize}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="/admin/member/{{member.username}}/membership:fatty">Fatty (100PLN p/m)</a></li>
<li><a href="/admin/member/{{member.username}}/membership:starving">Starving (50PLN p/m)</a></li>
<li><a href="/admin/member/{{member.username}}/membership:fatty">Fatty ({{ config['MEMBERSHIP_FEES']['fatty']}}PLN p/m)</a></li>
<li><a href="/admin/member/{{member.username}}/membership:starving">Starving ({{ config['MEMBERSHIP_FEES']['starving']}}PLN p/m)</a></li>
<li><a href="/admin/member/{{member.username}}/membership:supporting">Supporting</a></li>
</ul>
</div>

4
web/webapp/templates/match_user_transfer.html
View file

@ -24,8 +24,8 @@
<li>{{member_transfer.year}}/{{member_transfer.month}} - <b>{{ member_transfer.transfer.amount/100 }}PLN</b> (transfer „ {{member_transfer.transfer.title}}” at {{member_transfer.transfer.date}} from {{member_transfer.transfer.account_from}})</li>
{% endfor %}
</ul>
{% set fattycount = transfer.amount/10000 %}
{% set starvingcount = transfer.amount/5000 %}
{% set fattycount = transfer.amount/(config['MEMBERSHIP_FEES']['fatty'] * 100) %}
{% set starvingcount = transfer.amount/(config['MEMBERSHIP_FEES']['starving'] * 100) %}
<a href="javascript:payment(1, '{{transfer.uid}}', '{{ member.username }}')">This is a one-time payment.</a><br />
<a href="javascript:payment({{fattycount|int}}, '{{transfer.uid}}', '{{ member.username }}')">This is a {{fattycount|int}}-time payment. (fatty)</a><br />
<a href="javascript:payment({{starvingcount|int}}, '{{transfer.uid}}', '{{ member.username }}')">This is a {{starvingcount|int}}-time payment. (starving)</a><br />