Fixed #67 -- Activating ticket downloads

This commit is contained in:
Raphael Michel
2015-06-15 19:18:23 +02:00
parent 7162366478
commit e3f7e73063
2 changed files with 7 additions and 12 deletions

View File

@@ -3,11 +3,6 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% block inside %} {% block inside %}
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
{% if "success" in request.GET %}
<div class="alert alert-success">
{% trans "Your changes have been saved." %}
</div>
{% endif %}
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset>
<legend>{% trans "Ticket download" %}</legend> <legend>{% trans "Ticket download" %}</legend>

View File

@@ -94,13 +94,14 @@ class EventPlugins(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin
plugins_active.remove(module) plugins_active.remove(module)
self.object.plugins = ",".join(plugins_active) self.object.plugins = ",".join(plugins_active)
self.object.save() self.object.save()
messages.success(self.request, _('Your changes have been saved.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
def get_success_url(self) -> str: def get_success_url(self) -> str:
return reverse('control:event.settings.plugins', kwargs={ return reverse('control:event.settings.plugins', kwargs={
'organizer': self.get_object().organizer.slug, 'organizer': self.get_object().organizer.slug,
'event': self.get_object().slug, 'event': self.get_object().slug,
}) + '?success=true' })
class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin): class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin):
@@ -153,6 +154,7 @@ class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMi
else: else:
success = False success = False
if success: if success:
messages.success(self.request, _('Your changes have been saved.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
else: else:
return self.get(request) return self.get(request)
@@ -161,7 +163,7 @@ class PaymentSettings(EventPermissionRequiredMixin, TemplateView, SingleObjectMi
return reverse('control:event.settings.payment', kwargs={ return reverse('control:event.settings.payment', kwargs={
'organizer': self.get_object().organizer.slug, 'organizer': self.get_object().organizer.slug,
'event': self.get_object().slug, 'event': self.get_object().slug,
}) + '?success=true' })
class TicketSettings(EventPermissionRequiredMixin, FormView): class TicketSettings(EventPermissionRequiredMixin, FormView):
@@ -170,10 +172,6 @@ class TicketSettings(EventPermissionRequiredMixin, FormView):
template_name = 'pretixcontrol/event/tickets.html' template_name = 'pretixcontrol/event/tickets.html'
permission = 'can_change_settings' permission = 'can_change_settings'
def form_valid(self, form):
form.save()
return super().form_valid(form)
def get_context_data(self, *args, **kwargs) -> dict: def get_context_data(self, *args, **kwargs) -> dict:
context = super().get_context_data(*args, **kwargs) context = super().get_context_data(*args, **kwargs)
context['providers'] = self.provider_forms context['providers'] = self.provider_forms
@@ -183,7 +181,7 @@ class TicketSettings(EventPermissionRequiredMixin, FormView):
return reverse('control:event.settings.tickets', kwargs={ return reverse('control:event.settings.tickets', kwargs={
'organizer': self.request.event.organizer.slug, 'organizer': self.request.event.organizer.slug,
'event': self.request.event.slug 'event': self.request.event.slug
}) + '?success=true' })
def get_form_kwargs(self): def get_form_kwargs(self):
kwargs = super().get_form_kwargs() kwargs = super().get_form_kwargs()
@@ -204,6 +202,8 @@ class TicketSettings(EventPermissionRequiredMixin, FormView):
success = False success = False
form = self.get_form(self.get_form_class()) form = self.get_form(self.get_form_class())
if success and form.is_valid(): if success and form.is_valid():
form.save()
messages.success(self.request, _('Your changes have been saved.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
else: else:
return self.get(request) return self.get(request)