From: Jan Szejko Date: Thu, 28 Jul 2016 14:44:22 +0000 (+0200) Subject: newsletter checkboxes in funding X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/86ece3be121fe57d58e76bffcd52713d413cacc1?ds=sidebyside newsletter checkboxes in funding --- diff --git a/src/funding/forms.py b/src/funding/forms.py index 6feb104c9..8f1c3be4b 100644 --- a/src/funding/forms.py +++ b/src/funding/forms.py @@ -5,12 +5,14 @@ from django import forms from django.utils import formats from django.utils.translation import ugettext_lazy as _, ugettext, get_language + +from newsletter.forms import NewsletterForm from .models import Funding from .widgets import PerksAmountWidget from . import app_settings -class FundingForm(forms.Form): +class FundingForm(NewsletterForm): required_css_class = 'required' amount = forms.DecimalField(label=_("Amount"), decimal_places=2, widget=PerksAmountWidget()) @@ -44,6 +46,7 @@ class FundingForm(forms.Form): return self.cleaned_data def save(self): + super(FundingForm, self).save() funding = Funding.objects.create( offer=self.offer, name=self.cleaned_data['name'], diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html index 535008123..bf21f3d27 100644 --- a/src/funding/templates/funding/offer_detail.html +++ b/src/funding/templates/funding/offer_detail.html @@ -42,7 +42,20 @@

{% trans "Support the publication" %}

- {{ form.as_table }} + {# FIXME after upgrade to django 1.9 use field_order #} + {% for field in form %} + {% if field.name != 'agree_newsletter' %} + + + + + {% endif %} + {% endfor %} +
{{ field.label }} + {{ field.errors }}{{ field }} + {% if field.help_text %}
{{ field.help_text }} + {% endif %} +