X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b6f95eff8a5fa136edb60905284c5fd54f509fac..e353262951cc8b8d3f1a52b896a825bad743a5a7:/apps/suggest/forms.py?ds=sidebyside diff --git a/apps/suggest/forms.py b/apps/suggest/forms.py index 5c034e654..b7c614f31 100644 --- a/apps/suggest/forms.py +++ b/apps/suggest/forms.py @@ -7,19 +7,63 @@ from django.core.mail import send_mail, mail_managers from django.core.urlresolvers import reverse from django.core.validators import email_re from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext -from suggest.models import PublishingSuggestion +from suggest.models import PublishingSuggestion, Suggestion class SuggestForm(forms.Form): contact = forms.CharField(label=_('Contact'), max_length=120, required=False) description = forms.CharField(label=_('Description'), widget=forms.Textarea, required=True) + def save(self, request): + contact = self.cleaned_data['contact'] + description = self.cleaned_data['description'] + + suggestion = Suggestion(contact=contact, + description=description, ip=request.META['REMOTE_ADDR']) + if request.user.is_authenticated(): + suggestion.user = request.user + suggestion.save() + + mail_managers(u'Nowa sugestia na stronie WolneLektury.pl', u'''\ +Zgłoszono nową sugestię w serwisie WolneLektury.pl. +http://%(site)s%(url)s + +Użytkownik: %(user)s +Kontakt: %(contact)s + +%(description)s''' % { + 'site': Site.objects.get_current().domain, + 'url': reverse('admin:suggest_suggestion_change', args=[suggestion.id]), + 'user': str(request.user) if request.user.is_authenticated() else '', + 'contact': contact, + 'description': description, + }, fail_silently=True) + + if email_re.match(contact): + send_mail(u'[WolneLektury] ' + _(u'Thank you for your suggestion.'), + _(u"""\ +Thank you for your comment on WolneLektury.pl. +The suggestion has been referred to the project coordinator.""") + +u""" + +-- +""" + _(u'''Message sent automatically. Please do not reply.'''), + 'no-reply@wolnelektury.pl', [contact], fail_silently=True) + class PublishingSuggestForm(forms.Form): contact = forms.CharField(label=_('Contact'), max_length=120, required=False) - books = forms.CharField(label=_('books'), widget=forms.Textarea, required=True) - audiobooks = forms.CharField(label=_('audiobooks'), widget=forms.Textarea, required=True) + books = forms.CharField(label=_('books'), widget=forms.Textarea, required=False) + audiobooks = forms.CharField(label=_('audiobooks'), widget=forms.Textarea, required=False) + + def clean(self, *args, **kwargs): + if not self.cleaned_data['books'] and not self.cleaned_data['audiobooks']: + msg = _(u"One of these fields is required.") + self._errors["books"] = self.error_class([msg]) + self._errors["audiobooks"] = self.error_class([msg]) + return super(PublishingSuggestForm, self).clean(*args, **kwargs) def save(self, request): contact = self.cleaned_data['contact'] @@ -52,12 +96,13 @@ Audiobooki: }, fail_silently=True) if email_re.match(contact): - send_mail(u'[WolneLektury] ' + _(u'Thank you for your suggestion.'), - _(u"""\ + send_mail(u'[WolneLektury] ' + + ugettext(u'Thank you for your suggestion.'), + ugettext(u"""\ Thank you for your comment on WolneLektury.pl. The suggestion has been referred to the project coordinator.""") + u""" -- -""" + _(u'''Message sent automatically. Please do not reply.'''), +""" + ugettext(u'''Message sent automatically. Please do not reply.'''), 'no-reply@wolnelektury.pl', [contact], fail_silently=True)