new layout fixes

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

diff --git a/src/messaging/admin.py b/src/messaging/admin.py
index 854079b..e01adac 100644 (file)
--- a/src/messaging/admin.py
+++ b/src/messaging/admin.py
@@ -1,23 +1,12 @@
 from django.contrib import admin
 from django.contrib import admin

+from django.contrib import messages

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _

+from fnpdjango.actions import export_as_csv_action

 from . import models
 
 
 from . import models
 
 

-class EmailSentInline(admin.TabularInline):
-    model = models.EmailSent
-    fields = ['timestamp', 'email', 'subject']
-    readonly_fields = ['timestamp', 'email', 'subject']
-    extra = 0
-    can_delete = False
-    show_change_link = True
-
-    def has_add_permission(self, request, obj):
-        return False
-
-

 class EmailTemplateAdmin(admin.ModelAdmin):
 class EmailTemplateAdmin(admin.ModelAdmin):

-    list_display = ['state', 'min_days_since', 'subject', 'min_hour']
-    inlines = [EmailSentInline]
+    list_display = ['state', 'min_days_since', 'subject', 'min_hour', 'is_active']

     fieldsets = [
         (None, {"fields": [
             'state',
     fieldsets = [
         (None, {"fields": [
             'state',


@@ -34,14 +23,29 @@ class EmailTemplateAdmin(admin.ModelAdmin):
         ]}),
     ]
 
         ]}),
     ]
 

+    def _test_email(self, request, obj):
+        if request.user.email:
+            obj.send_test_email(request.user.email)
+            messages.info(request, _('Test e-mail has been sent to %(email)s.') % {"email": request.user.email})
+        else:
+            messages.warning(request, _('You have no email set. Test e-mail not sent.'))
+
+    def response_add(self, request, obj):
+        self._test_email(request, obj)
+        return super().response_add(request, obj)
+
+    def response_change(self, request, obj):
+        self._test_email(request, obj)
+        return super().response_change(request, obj)
+

 
 admin.site.register(models.EmailTemplate, EmailTemplateAdmin)
 
 
 class EmailSentAdmin(admin.ModelAdmin):
     list_filter = ['template']
 
 admin.site.register(models.EmailTemplate, EmailTemplateAdmin)
 
 
 class EmailSentAdmin(admin.ModelAdmin):
     list_filter = ['template']

-    list_display = ['timestamp', 'template', 'email', 'subject']
-    fields = ['timestamp', 'template', 'email', 'subject', 'body', 'hash_value']
+    list_display = ['timestamp', 'template', 'contact', 'subject']
+    fields = ['timestamp', 'template', 'contact', 'subject', 'body']

     readonly_fields = fields
     change_links = ['template']
 
     readonly_fields = fields
     change_links = ['template']
 


@@ -49,11 +53,28 @@ class EmailSentAdmin(admin.ModelAdmin):
 admin.site.register(models.EmailSent, EmailSentAdmin)
 
 
 admin.site.register(models.EmailSent, EmailSentAdmin)
 
 

+class ContactEmailSentInline(admin.TabularInline):
+    model = models.EmailSent
+    fields = ['timestamp', 'template', 'subject']
+    readonly_fields = ['timestamp', 'template', 'subject']
+    extra = 0
+    can_delete = False
+    show_change_link = True
+
+    def has_add_permission(self, request, obj):
+        return False
+
+

 class ContactAdmin(admin.ModelAdmin):
 class ContactAdmin(admin.ModelAdmin):

+    inlines = [ContactEmailSentInline]

     list_filter = ['level']
     list_display = ['email', 'level', 'since', 'expires_at']
     search_fields = ['email']
     date_hierarchy = 'since'
     list_filter = ['level']
     list_display = ['email', 'level', 'since', 'expires_at']
     search_fields = ['email']
     date_hierarchy = 'since'

+    actions = [
+#        export_as_csv_action(fields=['id', 'email', 'get_level_display', 'since', 'expires_at']),
+        export_as_csv_action('Eksport dla PHPList', fields=['email', 'wl_optout_url'])
+    ]

 
 
 admin.site.register(models.Contact, ContactAdmin)
 
 
 admin.site.register(models.Contact, ContactAdmin)