0001-general-sms-are-separated-from-mail-announces-12918.patch

Serghei Mihai (congés, retour 15/05), 15 septembre 2016 18:45

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

Subject: [PATCH] general: sms are separated from mail announces (#12918)

 corbo/forms.py                             | 11 +++++-
 corbo/manage_urls.py                       | 11 +++++-
 corbo/migrations/0006_sms.py               | 26 ++++++++++++++
 corbo/models.py                            | 17 +++++++++-
 corbo/templates/corbo/category_detail.html | 11 +++---
 corbo/templates/corbo/manage.html          |  4 +++
 corbo/views.py                             | 54 +++++++++++++++++++++++++++---
 7 files changed, 122 insertions(+), 12 deletions(-)
 create mode 100644 corbo/migrations/0006_sms.py

     from django import forms
     from django.utils.translation import ugettext_lazy as _
     from .models import Announce, Category, Broadcast, channel_choices
     from .models import Announce, Category, Broadcast, SMS
     class AnnounceForm(forms.ModelForm):
-...
         class Meta:
             fields = ('name', )
             model = Category
     class SMSForm(forms.ModelForm):
         class Meta:
             model = SMS
             fields = '__all__'
             widgets = {'expedition_time': forms.TextInput(attrs={'class': 'datetimepicker',
                                                            'readonly': True})}

     from .views import add_announce, edit_announce, delete_announce, \
         add_category, edit_category, view_category, delete_category, manage, \
         add_announce_for_category, menu_json
         add_announce_for_category, add_sms, add_sms_for_category, edit_sms, \
         delete_sms, menu_json
     urlpatterns = patterns('',
                 url(r'^$', manage, name='manage'),
-...
                     name='view_category'),
                 url(r'^category/(?P<pk>\d+)/announce/$', add_announce_for_category,
                     name='add_announce_for_category'),
                 url(r'^sms/add$', add_sms,
                     name='add_sms'),
                 url(r'^category/(?P<pk>\d+)/sms/$', add_sms_for_category,
                     name='add_sms_for_category'),
                 url(r'^sms/edit/(?P<pk>\d+)$', edit_sms,
                     name='edit_sms'),
                 url(r'^sms/delete/(?P<pk>\d+)$', delete_sms,
                     name='delete_sms'),
                 url(r'^category/add$', add_category,
                     name='add_category'),
                 url(r'^category/edit/(?P<pk>\d+)$', edit_category,

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('corbo', '0005_auto_20160504_1747'),
+        ]
         operations = [
             migrations.CreateModel(
                 name='SMS',
                 fields=[
                     ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                     ('content', models.TextField(help_text='160 chars maximum', max_length=160)),
                     ('expedition_time', models.DateTimeField(null=True, verbose_name='Expedition time', blank=True)),
                     ('category', models.ForeignKey(verbose_name='category', to='corbo.Category')),
                 ],
                 options={
                 },
                 bases=(models.Model,),
             ),
+        ]

     channel_choices = (
         ('mailto', _('Email')),
         ('homepage', _('Homepage'))
         ('homepage', _('Homepage')),
         ('sms', _('SMS'))
+    )
     logger = logging.getLogger(__name__)
-...
         def get_announces_count(self):
             return self.announce_set.all().count()
         def get_sms_count(self):
             return self.sms_set.all().count()
         def get_subscriptions_count(self):
             return self.subscription_set.all().count()
-...
         class Meta:
             unique_together = ('category', 'identifier', 'uuid')
     class SMS(models.Model):
         category  = models.ForeignKey('Category', verbose_name=_('category'))
         content = models.TextField(max_length=160, help_text=_('160 chars maximum'))
         expedition_time = models.DateTimeField(_('Expedition time'), blank=True,
                                     null=True)
         @property
         def sent(self):
             return self.expedition_time and self.expedition_time > timezone.now()

     <h2>{{ object.name }}</h2>
     <a href="{% url 'delete_category' object.id %}" rel="popup">{% trans 'Delete' %}</a>
     <a href="{% url 'edit_category' object.id %}" rel="popup">{% trans 'Rename' %}</a>
     <a href="{% url 'add_sms_for_category' pk=object.pk %}">{% trans 'New SMS' %}</a>
     <a href="{% url 'add_announce_for_category' pk=object.pk %}">{% trans 'New announce' %}</a>
     {% endblock %}
     {% block content %}
     <div id="management">
     <ul class='objects-list single-links'>
     {% for sms in sms_messages %}
     <li class="{% if not sms.sent %}unpublished{% endif %}">
       <a href="{% url 'edit_sms' sms.id %}">{{ sms.content|truncatechars:40 }}...</a>
     </li>
     {% endfor %}
     {% for announce in announces %}
     <li class="{% if not announce.is_published %}unpublished{% endif %}">
       <a href="{% url 'edit_announce' announce.id %}">{{ announce.title }}</a>
-...
         {% endif %}
       </div>
     </li>
     {% empty %}
     <div class="empty">
       {% trans "No announces yet." %}
     </div>
     {% endfor %}
     </ul>
     {% endblock %}

     {% block appbar %}
     <h2>{% trans "Categories" %}</h2>
     <a href="{% url 'add_category' %}" rel='popup'>{% trans 'New category' %}</a>
     <a href="{% url 'add_sms' %}">{% trans 'New sms' %}</a>
     <a href="{% url 'add_announce' %}">{% trans 'New announce' %}</a>
     {% endblock %}
-...
               {% plural %}
               {{ announces_number }} announces
               {% endblocktrans %} /
               {% blocktrans with sms_number=obj.get_sms_count %}
               {{ sms_number }} sms
               {% endblocktrans %} /
               {% blocktrans count subscriptions_number=obj.get_subscriptions_count %}
               {{ subscriptions_number }} subscription
               {% plural %}

     from django.utils.translation import ugettext_lazy as _
     import models
     from .forms import AnnounceForm, CategoryForm
     from .forms import AnnounceForm, CategoryForm, SMSForm
     try:
         from mellon.utils import get_idps
-...
     add_announce = AnnounceCreateView.as_view()
     class AnnounceForCategoryCreateView(AnnounceCreateView):
     class ForCategoryMixin(object):
         def get_initial(self):
             initial = super(AnnounceForCategoryCreateView, self).get_initial()
             initial = super(ForCategoryMixin, self).get_initial()
             initial['category'] = models.Category.objects.get(pk=self.kwargs['pk'])
             return initial
         def get_context_data(self, **kwargs):
             context = super(AnnounceForCategoryCreateView, self).get_context_data(**kwargs)
             context = super(ForCategoryMixin, self).get_context_data(**kwargs)
             context['category'] = kwargs['form'].initial['category']
             return context
     class AnnounceForCategoryCreateView(ForCategoryMixin, AnnounceCreateView):
         pass
     add_announce_for_category = AnnounceForCategoryCreateView.as_view()
-...
     delete_announce = AnnounceDeleteView.as_view()
     class SmsCreateView(CreateView):
         model = models.SMS
         form_class = SMSForm
         template_name = 'corbo/sms_form.html'
         def get_success_url(self):
             return reverse('view_category', kwargs={'pk': self.object.category.pk})
     add_sms = SmsCreateView.as_view()
     class SmsForCategoryCreateView(ForCategoryMixin, SmsCreateView):
         pass
     add_sms_for_category = SmsForCategoryCreateView.as_view()
     class SmsEditView(UpdateView):
         model = models.SMS
         form_class = SMSForm
         def get_context_data(self, **kwargs):
             context = super(SmsEditView, self).get_context_data(**kwargs)
             category_id = kwargs['form'].initial['category']
             context['category'] = models.Category.objects.get(pk=category_id)
             return context
         def get_success_url(self):
             return reverse('view_category', kwargs={'pk': self.object.category.pk})
     edit_sms = SmsEditView.as_view()
     class SMSDeleteView(DeleteView):
         model = models.SMS
     delete_sms = SMSDeleteView.as_view()
     class CategoryCreateView(CreateView):
         form_class = CategoryForm
         template_name = 'corbo/category_form.html'
-...
         def get_context_data(self, **kwargs):
             context = super(CategoryView, self).get_context_data(**kwargs)
             context['announces'] = self.object.announce_set.all()
             context['sms_messages'] = self.object.sms_set.all()
             return context
     view_category = CategoryView.as_view()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Corbo

0001-general-sms-are-separated-from-mail-announces-12918.patch