X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6c9978c5bf8b1ef20871557c22b8b02df647d700..refs/heads/filmowa:/contact/admin.py diff --git a/contact/admin.py b/contact/admin.py index bb43881..22d3593 100644 --- a/contact/admin.py +++ b/contact/admin.py @@ -1,13 +1,16 @@ # -*- coding: utf-8 -*- +import csv +import json + from django.contrib import admin -from .models import Contact from django.utils.translation import ugettext as _ -from .forms import contact_forms, admin_list_width 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__): @@ -41,7 +44,7 @@ class ContactAdmin(admin.ModelAdmin): return lambda obj: self.admin_list(obj, nr) raise AttributeError(name) - def change_view(self, request, object_id, from_url='', 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,21 +76,22 @@ 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) + attach_getter(attachment.tag, link) return super(ContactAdmin, self).change_view( - request, object_id, from_url=from_url, extra_context=extra_context) + request, object_id, form_url=form_url, extra_context=extra_context) def changelist_view(self, request, extra_context=None): context = dict() @@ -114,7 +113,6 @@ class ContactAdmin(admin.ModelAdmin): 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'): @@ -129,18 +127,26 @@ def extract_view(request, form_tag, extract_type_slug): 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)] @@ -153,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