Minor Django version bump.

[wolnelektury.git] / src / newsletter / admin.py

diff --git a/src/newsletter/admin.py b/src/newsletter/admin.py
index 21ab434..7af7e0d 100644 (file)
--- a/src/newsletter/admin.py
+++ b/src/newsletter/admin.py
@@ -1,23 +1,33 @@
-# -*- coding: utf-8 -*-
-from django.conf.urls import url
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.urls import path

 from django.contrib import admin
 from django.http.response import HttpResponse
 from django.contrib import admin
 from django.http.response import HttpResponse

-
-from newsletter.models import Subscription
+from django.views.decorators.cache import never_cache
+from modeltranslation.admin import TranslationAdmin
+from newsletter.models import Subscription, Newsletter

 
 
 class SubscriptionAdmin(admin.ModelAdmin):
 
 
 class SubscriptionAdmin(admin.ModelAdmin):

+    list_display = ('email', 'active')
+    list_filter = ('active',)
+

     def get_urls(self):
         urls = super(SubscriptionAdmin, self).get_urls()
         my_urls = [
     def get_urls(self):
         urls = super(SubscriptionAdmin, self).get_urls()
         my_urls = [

-            url(r'^extract/$', self.extract_subscribers, name='extract_subscribers'),
+            path('extract/', self.extract_subscribers, name='extract_subscribers'),

         ]
         return my_urls + urls
 
         ]
         return my_urls + urls
 

+    @never_cache

     def extract_subscribers(self, request):
         active_subscriptions = Subscription.objects.filter(active=True)
     def extract_subscribers(self, request):
         active_subscriptions = Subscription.objects.filter(active=True)

-        return HttpResponse(',\n'.join(active_subscriptions.values_list('email', flat=True)),
+        return HttpResponse('\n'.join(active_subscriptions.values_list('email', flat=True)),

                             content_type='text/plain')
 
 
 admin.site.register(Subscription, SubscriptionAdmin)
                             content_type='text/plain')
 
 
 admin.site.register(Subscription, SubscriptionAdmin)

+
+
+admin.site.register(Newsletter, TranslationAdmin)