X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/a9bafa65589ccfdd04ea69eb09e637ab75387981..d93f1411e8e063e864a71c7eb11db93d8b170493:/contact/admin.py?ds=sidebyside
diff --git a/contact/admin.py b/contact/admin.py
index 641770e..22d3593 100644
--- a/contact/admin.py
+++ b/contact/admin.py
@@ -1,21 +1,23 @@
+# -*- coding: utf-8 -*-
+import csv
+import json
+
from django.contrib import admin
-from django.forms import ModelForm
-from .models import Contact
from django.utils.translation import ugettext as _
-from .forms import contact_forms, admin_list_width
-from django.template import Template
from django.utils.safestring import mark_safe
from django.conf.urls import patterns, url
from django.http import HttpResponse, Http404
-from .utils import csv_prepare
+from edumed.utils import UnicodeCSVWriter
+from .forms import contact_forms, admin_list_width
+from .models import Contact
class ContactAdminMeta(admin.ModelAdmin.__class__):
def __getattr__(cls, name):
if name.startswith('admin_list_'):
return lambda self: ""
- raise AttributeError, name
+ raise AttributeError(name)
class ContactAdmin(admin.ModelAdmin):
@@ -27,10 +29,11 @@ class ContactAdmin(admin.ModelAdmin):
readonly_fields = ['form_tag', 'created_at', 'contact', 'ip']
list_filter = ['form_tag']
- def admin_list(self, obj, nr):
+ @staticmethod
+ def admin_list(obj, nr):
try:
field_name = contact_forms[obj.form_tag].admin_list[nr]
- except BaseException, e:
+ except BaseException:
return ''
else:
return Contact.pretty_print(obj.body.get(field_name, ''), for_html=True)
@@ -39,9 +42,9 @@ class ContactAdmin(admin.ModelAdmin):
if name.startswith('admin_list_'):
nr = int(name[len('admin_list_'):])
return lambda obj: self.admin_list(obj, nr)
- raise AttributeError, name
+ raise AttributeError(name)
- def change_view(self, request, object_id, extra_context=None):
+ def change_view(self, request, object_id, form_url='', extra_context=None):
if object_id:
try:
instance = Contact.objects.get(pk=object_id)
@@ -50,10 +53,8 @@ class ContactAdmin(admin.ModelAdmin):
pass
else:
# Create readonly fields from the body JSON.
- body_fields = ['body__%s' % k for k in instance.body.keys()]
attachments = list(instance.attachment_set.all())
- body_fields += ['body__%s' % a.tag for a in attachments]
- self.readonly_fields.extend(body_fields)
+ body_keys = instance.body.keys() + [a.tag for a in attachments]
# Find the original form.
try:
@@ -62,15 +63,12 @@ class ContactAdmin(admin.ModelAdmin):
orig_fields = {}
# Try to preserve the original order.
- admin_fields = []
orig_keys = list(orig_fields.keys())
- while orig_keys:
- key = orig_keys.pop(0)
- key = "body__%s" % key
- if key in body_fields:
- admin_fields.append(key)
- body_fields.remove(key)
- admin_fields.extend(body_fields)
+ admin_keys = [key for key in orig_keys if key in body_keys] + \
+ [key for key in body_keys if key not in orig_keys]
+ admin_fields = ['body__%s' % key for key in admin_keys]
+
+ self.readonly_fields.extend(admin_fields)
self.fieldsets = [
(None, {'fields': self.fields}),
@@ -78,70 +76,82 @@ class ContactAdmin(admin.ModelAdmin):
]
# Create field getters for fields and attachments.
+ def attach_getter(key, value):
+ def f(self):
+ return value
+ f.short_description = orig_fields[key].label if key in orig_fields else _(key)
+ setattr(self, "body__%s" % key, f)
+
for k, v in instance.body.items():
- f = (lambda v: lambda self: v)(Contact.pretty_print(v, for_html=True))
- f.short_description = orig_fields[k].label if k in orig_fields else _(k)
- setattr(self, "body__%s" % k, f)
+ attach_getter(k, Contact.pretty_print(v, for_html=True))
download_link = "%(url)s"
for attachment in attachments:
- k = attachment.tag
link = mark_safe(download_link % {
'url': attachment.get_absolute_url()})
- f = (lambda v: lambda self: v)(link)
- f.short_description = orig_fields[k].label if k in orig_fields else _(k)
- setattr(self, "body__%s" % k, f)
- return super(ContactAdmin, self).change_view(request, object_id,
- extra_context=extra_context)
+ attach_getter(attachment.tag, link)
+ return super(ContactAdmin, self).change_view(
+ request, object_id, form_url=form_url, extra_context=extra_context)
def changelist_view(self, request, extra_context=None):
context = dict()
if 'form_tag' in request.GET:
form = contact_forms.get(request.GET['form_tag'])
- context['extract_types'] = [dict(slug = 'all', label = _('all'))] + [dict(slug = 'contacts', label = _('contacts'))]
+ context['extract_types'] = [
+ {'slug': 'all', 'label': _('all')},
+ {'slug': 'contacts', 'label': _('contacts')}]
context['extract_types'] += [type for type in getattr(form, 'extract_types', [])]
- return super(ContactAdmin, self).changelist_view(request, extra_context = context)
+ return super(ContactAdmin, self).changelist_view(request, extra_context=context)
def get_urls(self):
- urls = super(ContactAdmin, self).get_urls()
- return patterns('',
- url(r'^extract/(?P[\w-]+)/(?P[\w-]+)/$', self.admin_site.admin_view(extract_view), name='contact_extract')
+ # urls = super(ContactAdmin, self).get_urls()
+ return patterns(
+ '',
+ url(r'^extract/(?P[\w-]+)/(?P[\w-]+)/$',
+ self.admin_site.admin_view(extract_view), name='contact_extract')
) + super(ContactAdmin, self).get_urls()
def extract_view(request, form_tag, extract_type_slug):
- toret = u''
contacts_by_spec = dict()
form = contact_forms.get(form_tag)
if form is None and extract_type_slug not in ('contacts', 'all'):
raise Http404
- q = Contact.objects.filter(form_tag = form_tag)
+ q = Contact.objects.filter(form_tag=form_tag)
at_year = request.GET.get('created_at__year')
at_month = request.GET.get('created_at__month')
if at_year:
- q = q.filter(created_at__year = at_year)
+ q = q.filter(created_at__year=at_year)
if at_month:
- q = q.filter(created_at__month = at_month)
+ q = q.filter(created_at__month=at_month)
# Segregate contacts by body key sets
+ if form:
+ orig_keys = list(form().fields.keys())
+ else:
+ orig_keys = []
for contact in q.all():
if extract_type_slug == 'contacts':
keys = ['contact']
elif extract_type_slug == 'all':
keys = contact.body.keys() + ['contact']
+ keys = [key for key in orig_keys if key in keys] + [key for key in keys if key not in orig_keys]
else:
keys = form.get_extract_fields(contact, extract_type_slug)
contacts_by_spec.setdefault(tuple(keys), []).append(contact)
-
+
+ response = HttpResponse(content_type='text/csv')
+ csv_writer = UnicodeCSVWriter(response)
+
# Generate list for each body key set
for keys, contacts in contacts_by_spec.items():
- toret += u','.join(keys) + '\n'
+ csv_writer.writerow(keys)
for contact in contacts:
if extract_type_slug == 'contacts':
records = [dict(contact=contact.contact)]
elif extract_type_slug == 'all':
- records = [dict(contact = contact.contact, **contact.body)]
+ records = [dict(contact=contact.contact, **contact.body)]
else:
records = form.get_extract_records(keys, contact, extract_type_slug)
@@ -149,11 +159,18 @@ def extract_view(request, form_tag, extract_type_slug):
for key in keys:
if key not in record:
record[key] = ''
- record[key] = csv_prepare(record[key])
- toret += u','.join([record[key] for key in keys]) + '\n'
- toret += '\n\n'
+ if isinstance(record[key], basestring):
+ pass
+ elif isinstance(record[key], bool):
+ record[key] = 'tak' if record[key] else 'nie'
+ elif isinstance(record[key], (list, tuple)) and all(isinstance(v, basestring) for v in record[key]):
+ record[key] = ', '.join(record[key])
+ else:
+ record[key] = json.dumps(record[key])
+
+ csv_writer.writerow([record[key] for key in keys])
+ csv_writer.writerow([])
- response = HttpResponse(toret, content_type = 'text/csv')
response['Content-Disposition'] = 'attachment; filename="kontakt.csv"'
return response