Mercurial > sat_legacy_website
diff sat_website/forms.py @ 149:b1c16cd53b62
update django to version 1.11, refactor project structure, better PEP-8 compliance
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Tue, 17 Oct 2017 04:11:21 +0200 |
| parents | 75a95a1dfeb6 |
| children |
line wrap: on
line diff
--- a/sat_website/forms.py Tue Oct 17 19:18:44 2017 +0200 +++ b/sat_website/forms.py Tue Oct 17 04:11:21 2017 +0200 @@ -81,6 +81,10 @@ ## Forms ## +def html_link(url, label): + return string_concat('<a target="#" href="', url, '">', label, '</a>') + + class RegistrationForm(forms.Form): section_1 = Section(label=_(u'Identity')) @@ -104,9 +108,6 @@ mailing = BooleanField(required=False, label=_(u"I would like to subscribe to the adherents' mailing list.")) - def html_link(url, label): - return string_concat('<a target="#" href="', url, '">', label, '</a>') - agreement_label = [_(u"I read the "), html_link(settings.ASSO_URL_STATUTES, _(u"Statutes")), _(u" and "), @@ -257,7 +258,7 @@ return MSG.format(**data) def writeResultToCSV(self): - result = [unicode(value) for key, value in self.results(False)] + result = [unicode(value) for dummy, value in self.results(False)] with open(settings.ASSO_SUBSCR_CSV, 'a+') as csvfile: writer = unicodecsv.writer(csvfile, delimiter=';') writer.writerow(result) @@ -267,8 +268,20 @@ if not self.is_valid(): return # send email to user - send_mail(_(u'Subscription to Salut à Toi'), self.prepareResultForUser(), settings.FORM_FROM_EMAIL, [self['email'].value()], fail_silently=False) + send_mail( + _(u'Subscription to Salut à Toi'), + self.prepareResultForUser(), + settings.DEFAULT_FROM_EMAIL, + [self['email'].value()], + fail_silently=False + ) # send email to admins - send_mail(_(u'Subscription to Salut à Toi'), self.prepareResultForAdmin(), settings.FORM_FROM_EMAIL, settings.FORM_TO_EMAILS, fail_silently=False) + send_mail( + _(u'Subscription to Salut à Toi'), + self.prepareResultForAdmin(), + settings.DEFAULT_FROM_EMAIL, + [email for dummy, email in settings.ADMINS], + fail_silently=False + ) # save to a CSV file self.writeResultToCSV()