X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/bac512ce1616a089ca372392de1632001fc946ee..5116918efc22e206f68fa19529f93c913f98930f:/apps/suggest/views.py diff --git a/apps/suggest/views.py b/apps/suggest/views.py index 1fcb3363d..15b65f24d 100644 --- a/apps/suggest/views.py +++ b/apps/suggest/views.py @@ -2,63 +2,22 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.core.mail import send_mail, mail_managers -from django.core.urlresolvers import reverse -from django.core.validators import email_re -from django.http import HttpResponse, HttpResponseRedirect -from django.utils.translation import ugettext as _ -from django.views.decorators import cache -from django.views.decorators.http import require_POST -from django.contrib.sites.models import Site +from django.utils.translation import ugettext_lazy as _ +from ajaxable.utils import AjaxableFormView from suggest import forms -from suggest.models import Suggestion +from suggest.models import Suggestion, PublishingSuggestion -# FIXME - shouldn't be in catalogue -from catalogue.views import LazyEncoder +class PublishingSuggestionFormView(AjaxableFormView): + form_class = forms.PublishingSuggestForm + title = _('Report a bug or suggestion') + template = "publishing_suggest.html" + success_message = _('Report was sent successfully.') -#@require_POST -@cache.never_cache -def report(request): - suggest_form = forms.SuggestForm(request.POST) - if suggest_form.is_valid(): - contact = suggest_form.cleaned_data['contact'] - description = suggest_form.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) - - response_data = {'success': True, 'message': _('Report was sent successfully.')} - else: - response_data = {'success': False, 'errors': suggest_form.errors} - return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data)) +class SuggestionFormView(AjaxableFormView): + form_class = forms.SuggestForm + title = _('Report a bug or suggestion') + submit = _('Send report') + success_message = _('Report was sent successfully.')