0001-unsubscribe-link-10795.patch

Serghei Mihai, 28 June 2016 12:08 PM

View differences: inline side by side

Subject: [PATCH] unsubscribe link (#10795)

 corbo/models.py                                    | 22 +++++++++++++------
 corbo/static/css/corbo.css                         | 17 +++++++++++++++
 corbo/templates/corbo/announce.html                |  9 ++++++++
 .../corbo/subscription_confirm_delete.html         | 18 ++++++++++++++++
 corbo/templates/corbo/unsubscription.html          | 14 ++++++++++++
 corbo/templates/corbo/unsubscription_done.html     | 10 +++++++++
 corbo/urls.py                                      |  8 +++++--
 corbo/views.py                                     | 25 ++++++++++++++++++++++
 tests/test_emailing.py                             | 25 +++++++++++++++++++++-
 9 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 corbo/templates/corbo/announce.html
 create mode 100644 corbo/templates/corbo/subscription_confirm_delete.html
 create mode 100644 corbo/templates/corbo/unsubscription.html
 create mode 100644 corbo/templates/corbo/unsubscription_done.html

     from django.db import models
     from django.core.files.storage import DefaultStorage
     from django.utils.translation import ugettext_lazy as _
     from django.core import signing
     from django.template import loader, Context
     from django.core.urlresolvers import reverse
     from ckeditor.fields import RichTextField
-...
             subscriptions = self.announce.category.subscription_set.all()
             total_sent = 0
             handler = HTML2Text()
             m = Message(html=self.announce.text, subject=self.announce.title,
                         text=handler.handle(self.announce.text),
                         mail_from=settings.DEFAULT_FROM_EMAIL)
             template = loader.get_template('corbo/announce.html')
             m = Message(subject=self.announce.title, mail_from=settings.DEFAULT_FROM_EMAIL)
             html_tree = HTMLTree(self.announce.text)
             storage = DefaultStorage()
             for img in html_tree.xpath('//img/@src'):
                 img_path = img.lstrip(storage.base_url)
                 m.attach(filename=img, data=storage.open(img_path))
                 m.attachments[img].is_inline = True
             m.transformer.synchronize_inline_images()
             m.transformer.load_and_transform()
             m.transformer.save()
             for s in subscriptions:
                 if not s.identifier:
                     continue
                 unsubscribe_token = signing.dumps({'category': self.announce.category.pk,
                                                    'identifier': s.identifier})
                 unsubscribe_link = reverse('unsubscribe', kwargs={'unsubscription_token': unsubscribe_token})
                 message = template.render(Context({'unsubscribe_link': unsubscribe_link,
                                                    'content': self.announce.text}))
                 m.html = message
                 m.transformer.load_and_transform()
                 m.transformer.synchronize_inline_images()
                 m.transformer.save()
                 handler.body_width = 0
                 m.text = handler.handle(message)
                 sent = m.send(to=s.identifier)
                 if sent:
                     total_sent += 1

     #id_transport_channel li, #id_transport_channel label {
         display: inline;
+    }
     .content {
         width: 50%;
         margin: auto;
+    }
     .unsubscription {
         background: #e6db74;
         border: 1px solid #aaa;
         padding: 5px;
+    }
     .info {
         background: #a6e22e;
         border: 1px solid #aaa;
         padding: 5px;
+    }

     {% load i18n %}
     <div class="content">
       {{ content|safe }}
     </div>
     <div class="footer">
       {% blocktrans %}
       Click <a href='{{ unsubscribe_link}}'>here</a> to unsubscribe from this newsletter.
       {% endblocktrans %}
     </div>

     {% extends "corbo/unsubscription.html" %}
     {% load i18n %}
     {% block title %}{% blocktrans with object.category as category %}
     Unsubscription from {{ category }}
     {% endblocktrans %}{% endblock %}
     {% block content %}
     <div class="unsubscription">
     {% blocktrans with object.category as category and object.identifier as identifier %}
     Are you sure you want to unsubscribe {{ identifier }} from "{{ category }}"?
     {% endblocktrans %}
     <form method='POST'>
       {% csrf_token %}
       <button>{% trans "Unsubscribe" %}</button>
     </form>
     </div>
     {% endblock %}

     {% load static %}
     <!DOCTYPE html>
     <html>
       <head>
         <title>{% block title %}{% endblock %}</title>
         <link rel='stylesheet' type='text/css' href='{% static "css/corbo.css" %}' />
       </head>
       <body>
         <div class='content'>
         {% block content %}
         {% endblock %}
         </div>
       </body>
     </html>

     {% extends "corbo/unsubscription.html" %}
     {% load i18n %}
     {% block title %}
     {% trans "Successfully unsubscription" %}
     {% endblock %}
     {% block content %}
     <div class="info">{% trans "You were sucessfully unsubcribed." %}</div>
     {% endblock %}

     from django.contrib import admin
     from .urls_utils import decorated_includes, manager_required
     from .views import homepage, atom
     from .views import homepage, atom, unsubscribe, unsubscription_done
     from manage_urls import urlpatterns as manage_urls
     from api_urls import urlpatterns as api_urls
-...
                         include(manage_urls))),
         url(r'^ckeditor/', include('ckeditor.urls')),
         url(r'^admin/', include(admin.site.urls)),
         url(r'^api/', include(api_urls))
         url(r'^api/', include(api_urls)),
         url(r'^unsubscribe/done/$', unsubscription_done,
             name='unsubscription_done'),
         url(r'^unsubscribe/(?P<unsubscription_token>[\w:-]+)$', unsubscribe,
             name='unsubscribe'),
+    )
     if 'mellon' in settings.INSTALLED_APPS:

     from datetime import datetime
     from django.conf import settings
     from django.core import signing
     from django.core.urlresolvers import reverse
     from django.views.generic import CreateView, UpdateView, DeleteView, \
                                      ListView, TemplateView
     from django.contrib.syndication.views import Feed
     from django.utils.feedgenerator import Atom1Feed
     from django.utils.http import urlencode
     from django.http import Http404
     import models
     from .forms import AnnounceForm, CategoryForm
-...
     delete_category = CategoryDeleteView.as_view()
     class UnsubscribeView(DeleteView):
         model = models.Subscription
         def get_object(self, queryset=None):
             data = signing.loads(self.kwargs['unsubscription_token'])
             try:
                 return models.Subscription.objects.get(category__pk=data['category'],
                                     identifier=data['identifier'])
             except models.Subscription.DoesNotExist:
                 raise Http404
         def get_success_url(self):
             return reverse('unsubscription_done')
     unsubscribe = UnsubscribeView.as_view()
     class UnsubscriptionDoneView(TemplateView):
         template_name='corbo/unsubscription_done.html'
     unsubscription_done = UnsubscriptionDoneView.as_view()
     class ManageView(ListView):
         paginate_by = settings.ANNOUNCES_PER_PAGE
         template_name = 'corbo/manage.html'

     from django.core.urlresolvers import reverse
     from django.utils.http import urlencode
     from django.core import mail
     from django.core import mail, signing
     from django.utils import timezone
     from django.core.files.storage import DefaultStorage
     from django.core.urlresolvers import reverse
     from corbo.models import Category, Announce, Subscription, Broadcast
     from corbo.models import channel_choices
-...
             assert storage.url(image_name) in mail.outbox[0].attachments.keys()
             mail.outbox = []
         storage.delete(image_name)
     def test_unsubscription_link(app, categories, announces):
         for category in categories:
             uuid = uuid4()
             email = '%s@example.net' % uuid
             s = Subscription.objects.create(category=category,
                                     identifier=email,
                                     uuid=str(uuid))
             for announce in announces:
                 if announce.category != category:
                     continue
                 broadcast= Broadcast.objects.get(announce=announce)
                 broadcast.send()
                 assert broadcast.result
                 assert mail.outbox
                 signature = signing.dumps({'category': announce.category.pk,
                                            'identifier': email})
                 unsubscription_link = reverse('unsubscribe', kwargs={'unsubscription_token': signature})
                 assert mail.outbox[0].subject == announce.title
                 assert unsubscription_link in mail.outbox[0].html
                 assert unsubscription_link in mail.outbox[0].text
                 mail.outbox = []
+    -

Project

General

Profile

Produits Entr'ouvert » Corbo

0001-unsubscribe-link-10795.patch