Fixed bugs in voucher deletion view

This commit is contained in:
Raphael Michel
2016-04-13 11:10:37 +02:00
parent 93f824879e
commit 167b208df9
2 changed files with 5 additions and 12 deletions

View File

@@ -6,21 +6,14 @@
<h1>{% trans "Delete voucher" %}</h1>
<form action="" method="post" class="form-horizontal">
{% csrf_token %}
{% if not allowed %}
<p>{% trans "You can not delete this voucher after it has been redeemed" %}</p>
{% else %}
<p>{% blocktrans %}Are you sure you want to delete the voucher
<strong>{{ voucher }}</strong>?{% endblocktrans %}</p>
{% endif %}
<p>{% blocktrans %}Are you sure you want to delete the voucher <strong>{{ voucher }}</strong>?{% endblocktrans %}</p>
<div class="form-group submit-group">
<a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
{% trans "Cancel" %}
</a>
{% if allowed %}
<button type="submit" class="btn btn-danger btn-save">
{% trans "Delete" %}
</button>
{% endif %}
<button type="submit" class="btn btn-danger btn-save">
{% trans "Delete" %}
</button>
</div>
</form>
{% endblock %}

View File

@@ -39,7 +39,7 @@ class VoucherDelete(EventPermissionRequiredMixin, DeleteView):
if self.get_object().is_ordered():
messages.error(request, _('A voucher can not be deleted if it already has been redeemed.'))
return HttpResponseRedirect(self.get_success_url())
super().get(request, *args, **kwargs)
return super().get(request, *args, **kwargs)
@transaction.atomic()
def delete(self, request, *args, **kwargs):