Merge branch 'misjaksiazka'

diff --git a/src/ajaxable/templatetags/ajaxable_tags.py b/src/ajaxable/templatetags/ajaxable_tags.py
index 72b9baa..55059e5 100644 (file)
--- a/src/ajaxable/templatetags/ajaxable_tags.py
+++ b/src/ajaxable/templatetags/ajaxable_tags.py
@@ -3,6 +3,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import template
+from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
 
 from ajaxable.utils import placeholdized
@@ -31,8 +32,8 @@ def pretty_field(field, template=None):
     return mark_safe(template % {
         'errors': field.errors,
         'input': field,
-        'label': field.label,
-        'helptext': field.help_text,
+        'label': force_unicode(field.label),
+        'helptext': force_unicode(field.help_text),
     })
 
 

diff --git a/src/newsletter/admin.py b/src/newsletter/admin.py
index 21ab434..9fe387d 100644 (file)
--- a/src/newsletter/admin.py
+++ b/src/newsletter/admin.py
@@ -2,11 +2,15 @@
 from django.conf.urls import url
 from django.contrib import admin
 from django.http.response import HttpResponse
+from django.views.decorators.cache import never_cache
 
 from newsletter.models import Subscription
 
 
 class SubscriptionAdmin(admin.ModelAdmin):
+    list_display = ('email', 'active')
+    list_filter = ('active',)
+
     def get_urls(self):
         urls = super(SubscriptionAdmin, self).get_urls()
         my_urls = [
@@ -14,9 +18,10 @@ class SubscriptionAdmin(admin.ModelAdmin):
         ]
         return my_urls + urls
 
+    @never_cache
     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')