klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 11:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'historique_cotisations' into 'master'

Browse Source 
user: allow subscription history to be visible when subscription is expired

See merge request ae/Sith!169
This commit is contained in:
Antoine Bartuccio 2018-10-16 15:43:23 +02:00
commit 75dd171714
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/templates/core/user_detail.jinja
View File

@ -119,7 +119,25 @@
<div>
{{ user_subscription(profile) }}
</div>
<br>
{% endif %}
{% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
<div>
{# Shows tokens bought by the user #}
{{ show_tokens(profile) }}
{# Shows slots took by the user #}
{{ show_slots(profile) }}
</div>
{% endif %}
{% else %}
<div>
{% trans %}Not subscribed{% endtrans %}
{% if user.is_board_member %}
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans %}</a>
{% endif %}
{% endif %}
</div>
{% endif %}
{% if profile.was_subscribed and (user == profile or user.is_root or user.is_board_member)%}
<div id="drop_subscriptions">
<h5>{% trans %}Subscription history{% endtrans %}</h5>
<table>
@ -140,23 +158,6 @@
</table>
</div>
{% endif %}
{% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
<div>
{# Shows tokens bought by the user #}
{{ show_tokens(profile) }}
{# Shows slots took by the user #}
{{ show_slots(profile) }}
</div>
{% endif %}
{% else %}
<div>
{% trans %}Not subscribed{% endtrans %}
{% if user.is_board_member %}
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans %}</a>
{% endif %}
{% endif %}
</div>
{% endif %}
{% if user.is_root or user.is_board_member %}
<div>