Contact forms update.

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

diff --git a/src/contact/admin.py b/src/contact/admin.py
index 32d12ec..98413f3 100644 (file)
--- a/src/contact/admin.py
+++ b/src/contact/admin.py
@@ -1,3 +1,6 @@
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import csv
 import json
 
 import csv
 import json
 


@@ -19,8 +22,7 @@ class ContactAdminMeta(admin.ModelAdmin.__class__):
         raise AttributeError(name)
 
 
         raise AttributeError(name)
 
 

-class ContactAdmin(admin.ModelAdmin):
-    __metaclass__ = ContactAdminMeta
+class ContactAdmin(admin.ModelAdmin, metaclass=ContactAdminMeta):

     date_hierarchy = 'created_at'
     list_display = ['created_at', 'contact', 'form_tag'] + \
         ["admin_list_%d" % i for i in range(admin_list_width)]
     date_hierarchy = 'created_at'
     list_display = ['created_at', 'contact', 'form_tag'] + \
         ["admin_list_%d" % i for i in range(admin_list_width)]


@@ -54,7 +56,7 @@ class ContactAdmin(admin.ModelAdmin):
             else:
                 # Create readonly fields from the body JSON.
                 attachments = list(instance.attachment_set.all())
             else:
                 # Create readonly fields from the body JSON.
                 attachments = list(instance.attachment_set.all())

-                body_keys = body.keys() + [a.tag for a in attachments]
+                body_keys = list(body.keys()) + [a.tag for a in attachments]

 
                 # Find the original form.
                 try:
 
                 # Find the original form.
                 try: