0001-import-subscribers-from-csv-14010.patch

Serghei Mihai (congés, retour 15/05), 30 janvier 2017 18:06

Voir les différences: en ligne côte à côte

Subject: [PATCH] import subscribers from csv (#14010)

 corbo/forms.py                                     | 22 ++++++++++++
 corbo/manage_urls.py                               |  4 ++-
 corbo/static/css/corbo.css                         | 39 ++++++++++++++++++++++
 corbo/static/js/corbo.manager.js                   |  6 ++++
 corbo/templates/corbo/base.html                    |  2 ++
 corbo/templates/corbo/category_detail.html         |  5 +++
 .../templates/corbo/subscriptions_import_form.html | 23 +++++++++++++
 corbo/views.py                                     | 31 +++++++++++++++--
 8 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 corbo/static/js/corbo.manager.js
 create mode 100644 corbo/templates/corbo/subscriptions_import_form.html

     import csv
     from django import forms
     from django.utils.translation import ugettext_lazy as _
     from django.utils.text import slugify
     from django.core.exceptions import ObjectDoesNotExist
     from django.core import validators
     from django.core.exceptions import ValidationError
     from .models import Announce, Category, Broadcast, channel_choices
-...
                     slug = '%s-%s' % (base_slug, i)
                 self.instance.slug = slug
             return super(CategoryForm, self).save(commit=commit)
     class SubscriptionsImportForm(forms.Form):
         subscribers = forms.FileField(_('Subscribers'),
                         help_text=_('CSV file with email addresses on first column'))
         def clean_subscribers(self, *args, **kwargs):
             subscribers = []
             reader = csv.reader(self.cleaned_data['subscribers'])
             for idx, row in enumerate(reader, 1):
                 if not row[0]:
                     continue
                 try:
                     validators.validate_email(row[0])
                     subscribers.append(row[0])
                 except ValidationError:
                     raise ValidationError(_('Invalid email address at line %s' % idx))
             return subscribers

     from .views import add_announce, edit_announce, delete_announce, \
         add_category, edit_category, view_category, delete_category, manage, \
         menu_json
         subscriptions_import, menu_json
     urlpatterns = patterns('',
                 url(r'^$', manage, name='manage'),
-...
                     name='edit_category'),
                 url(r'^category/delete/(?P<slug>[\w-]+)$', delete_category,
                     name='delete_category'),
                 url(r'^category/(?P<slug>[\w-]+)/import-subscriptions$', subscriptions_import,
                     name='subscriptions-import'),
                 url(r'^menu.json$', menu_json),
+    )

         border-radius: 0.3em;
         text-transform: uppercase;
+    }
     #appbar .menu-opener {
             border: none;
             cursor: pointer;
+    }
     #appbar .menu {
             background: white;
             padding: 10px;
             list-style: none;
             position: absolute;
             right: 0px;
             margin-top: -24px;
             border: 1px solid #d0d0d0;
             background: #fafafa;
             box-shadow: 0px 1px 1px 2px rgba(0, 0, 0, 0.04);
             z-index: 100;
+    }
     #appbar .menu a {
             float: none;
             top: 0;
             right: 0;
             margin: 0;
             display: block;
             min-width: 12em;
+    }
     #appbar .menu li {
             margin: 1ex 0;
+    }
     #appbar .menu li a {
             border: none;
+    }
     #appbar .menu li a:hover {
             background: white;
+    }

corbo/static/js/corbo.manager.js
	1	$(function() {
	2	$('a.menu-opener').on('click', function() {
	3	$('#appbar .menu').toggle();
	4	});
	5	});
	6

         <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/datetimepicker.css' %}" />
         <script src="{% static 'js/bootstrap-datetimepicker.js' %}"></script>
         <script src="{% static 'js/locales/bootstrap-datetimepicker.fr.js' %}"></script>
         <script src="{% static 'js/corbo.manager.js' %}"></script>
         <script src="{% static 'js/gadjo.js' %}"></script>
     {% endblock %}
     {% block logout-url %}

     {% block appbar %}
     <h2>{{ object.name }}</h2>
     <a class="menu-opener">☰</a>
     <ul class="menu" style="display: none">
       <li><a href="{% url 'subscriptions-import' slug=category.slug %}" rel="popup">{% trans 'Import subscriptions' %}</a></li>
     </ul>
     <a href="{% url 'delete_category' slug=object.slug %}" rel="popup">{% trans 'Delete' %}</a>
     <a href="{% url 'edit_category' slug=object.slug %}" rel="popup">{% trans 'Edit' %}</a>
     <a href="{% url 'add_announce' slug=object.slug %}">{% trans 'New announce' %}</a>

     {% extends "corbo/category_detail.html" %}
     {% load i18n static %}
     {% block breadcrumb %}
     {{ block.super }}
     <a href='{% url "view_category" slug=category.slug %}'>{{ category }}</a>
     {% endblock %}
     {% block appbar %}
     <h2>{% trans "Import subscriptions" %}</h2>
     {% endblock %}
     {% block content %}
     <form method="post" enctype="multipart/form-data">
       {% csrf_token %}
       {{ form }}
     <div class="buttons">
       <button>{% trans "Save" %}</button>
       <a href="{% url "view_category" slug=category.slug %}" class="cancel">{% trans "Cancel" %}</a>
     </div>
     </form>
     {% endblock %}

     from django.utils import timezone
     from django.core.urlresolvers import reverse
     from django.views.generic import CreateView, UpdateView, DeleteView, \
         ListView, TemplateView, RedirectView, DetailView
         ListView, TemplateView, RedirectView, DetailView, FormView
     from django.contrib.syndication.views import Feed
     from django.shortcuts import resolve_url
     from django.utils.encoding import force_text
-...
     from django.http import HttpResponseRedirect, HttpResponse, Http404
     from django.contrib.auth import logout as auth_logout
     from django.contrib.auth import views as auth_views
     from django.contrib import messages
     from django.utils.translation import ugettext_lazy as _
     import models
     from .forms import AnnounceForm, CategoryForm
     from .forms import AnnounceForm, CategoryForm, SubscriptionsImportForm
     try:
         from mellon.utils import get_idps
-...
     atom = AtomView()
     class SubscriptionsImportView(FormView):
         form_class = SubscriptionsImportForm
         template_name = 'corbo/subscriptions_import_form.html'
         def get_context_data(self, **kwargs):
             context = super(SubscriptionsImportView, self).get_context_data(**kwargs)
             context['category'] = models.Category.objects.get(slug=self.kwargs['slug'])
             return context
         def get_success_url(self):
             category = models.Category.objects.get(slug=self.kwargs['slug'])
             return reverse('view_category', kwargs={'slug': category.slug})
         def form_valid(self, form):
             new = 0
             c = models.Category.objects.get(slug=self.kwargs['slug'])
             for email in form.cleaned_data['subscribers']:
                 obj, created = models.Subscription.objects.get_or_create(category=c, identifier='mailto:%s' % email)
                 if created:
                    new += 1
             messages.info(self.request, _('%s subscriptions added') % new)
             return super(SubscriptionsImportView, self).form_valid(form)
     subscriptions_import = SubscriptionsImportView.as_view()
     def menu_json(request):
         label = _('Announces')
         json_str = json.dumps([{'label': force_text(label),
+    -

Projet

Général

Profil

Produits Entr'ouvert » Corbo

0001-import-subscribers-from-csv-14010.patch