ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'master' into task/3994/dg_add_signup_clarification_line

Browse source
This commit is contained in:
PCoder 2017-12-27 21:18:13 +01:00
commit a743e4e8a0
8 changed files with 185 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
digitalglarus/templates/digitalglarus/membership_orders_list.html
View file

@ -95,12 +95,9 @@
<a class="btn btn-primary btn-grey btn-deactivate print" href="{% url 'digitalglarus:membership_deactivate' %}">Deactivate</a>
</div>
{% elif not current_membership.active %}
<form method="POST" action="{% url 'digitalglarus:membership_reactivate' %}">
{% csrf_token %}
<div class="edit-button">
<button type="submit" class="btn btn-primary btn-grey btn-deactivate print" href="{% url 'digitalglarus:membership_reactivate' %}">Reactivate</button>
<a class="btn btn-primary btn-grey btn-deactivate" href="{% url 'digitalglarus:membership_pricing' %}">Reactivate</a>
</div>
</form>
{% endif %}
{% else %}
<div class="edit-button">