Add moderation for mailing lists

com/templates/com/mailing_admin.jinja

@@ -4,22 +4,37 @@
 {% trans %}Mailing lists administration{% endtrans %}
 {% endblock %}
 
-{% block content %}
-    <h1>{% trans %}This page lists all existing mailing lists{% endtrans %}</h1>
-    {% if has_objects %}
+{% macro display_mailings(list) %}
     <table>
         <tr>
             <th>{% trans %}Email{% endtrans %}</th>
             <th>{% trans %}Club{%endtrans%}</th>
+            <th>{% trans %}Actions{% endtrans %}</th>
         </tr>
-        {% for mailing in object_list %}
+        {% for mailing in list %}
         <tr>
             <td>{{ mailing.email }}</td>
-            <td><a href="{{ url('club:mailing', club_id=mailing.club.id) }}">{{ mailing.club }}</a> <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+            <td><a href="{{ url('club:mailing', club_id=mailing.club.id) }}">{{ mailing.club }}</a></td>
+            <td>
+                <a href="{{ url('com:mailing_delete', mailing_id=mailing.id) }}">{% trans %}Delete{% endtrans %}</a> - {% if not mailing.is_moderated %}<a href="{{ url('com:mailing_moderate', mailing_id=mailing.id) }}">{% trans %}Moderate{% endtrans %}</a>{% else %}{% trans user=mailing.moderator %}Moderated by {{ user }}{% endtrans %}{% endif %}
+            </td>
         </tr>
         {% endfor %}
     </table>
+    
+{% endmacro %}
 
+{% block content %}
+    <h1>{% trans %}This page lists all mailing lists{% endtrans %}</h1>
+
+    {% if has_unmoderated %}
+    <h2>{% trans %}Not moderated mailing lists{% endtrans %}</h2>
+    {{ display_mailings(unmoderated) }}
+    {% endif %}
+
+    <h2>{% trans %}Moderated mailing lists{% endtrans %}</h2>
+    {% if has_moderated %}
+        {{ display_mailings(moderated) }}
     {% else %}
     <p>{% trans %}No mailing list existing{% endtrans %}</p>
     {% endif %}

com/urls.py

@@ -25,6 +25,7 @@
 from django.conf.urls import url
 
 from com.views import *
+from club.views import MailingDeleteView
 
 urlpatterns = [
     url(r'^sith/edit/alert$', AlertMsgEditView.as_view(), name='alert_edit'),
@@ -43,5 +44,7 @@ urlpatterns = [
     url(r'^news/(?P<news_id>[0-9]+)/edit$', NewsEditView.as_view(), name='news_edit'),
     url(r'^news/(?P<news_id>[0-9]+)$', NewsDetailView.as_view(), name='news_detail'),
     url(r'^mailings$', MailingListAdminView.as_view(), name='mailing_admin'),
+    url(r'^mailings/(?P<mailing_id>[0-9]+)/moderate$', MailingModerateView.as_view(), name='mailing_moderate'),
+    url(r'^mailings/(?P<mailing_id>[0-9]+)/delete$', MailingDeleteView.as_view(redirect_page='com:mailing_admin'), name='mailing_delete'),
 ]
 

com/views.py

@@ -25,7 +25,7 @@
 
 from django.shortcuts import redirect, get_object_or_404
 from django.http import HttpResponseRedirect
-from django.views.generic import ListView, DetailView
+from django.views.generic import ListView, DetailView, View
 from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
 from django.utils.translation import ugettext_lazy as _
@@ -429,11 +429,27 @@ class MailingListAdminView(ComTabsMixin, ListView):
     current_tab = "mailings"
 
     def dispatch(self, request, *args, **kwargs):
-        if not request.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or request.user.is_root:
+        if not (request.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or request.user.is_root):
             raise PermissionDenied
         return super(MailingListAdminView, self).dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super(MailingListAdminView, self).get_context_data(**kwargs)
-        kwargs['has_objects'] = len(kwargs['object_list']) > 0
+        kwargs['moderated'] = self.get_queryset().filter(is_moderated=True).all()
+        kwargs['unmoderated'] = self.get_queryset().filter(is_moderated=False).all()
+        kwargs['has_moderated'] = len(kwargs['moderated']) > 0
+        kwargs['has_unmoderated'] = len(kwargs['unmoderated']) > 0
         return kwargs
+
+
+class MailingModerateView(View):
+
+    def get(self, request, *args, **kwargs):
+        mailing = get_object_or_404(Mailing, pk=kwargs['mailing_id'])
+        if mailing.can_moderate(request.user):
+            mailing.is_moderated = True
+            mailing.moderator = request.user
+            mailing.save()
+            return redirect('com:mailing_admin')
+
+        raise PermissionDenied