Changeset 4b1f99b

Timestamp:

Mar 31, 2012, 7:07:26 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

9becc84

Parents:

c409ae1

git-author:

Alex Dehnert <adehnert@…> (03/31/12 19:07:26)

git-committer:

Alex Dehnert <adehnert@…> (03/31/12 19:07:26)

Message:

HTML format as appropriate

File:

• asadb/groups/views.py (modified) (5 diffs)

asadb/groups/views.py

@@ -17 +17 @@
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.core.urlresolvers import reverse
+from django.core.validators import URLValidator, EmailValidator, email_re
 from django.core.mail import EmailMessage, mail_admins
 from django import forms
@@ -22 +23 @@
 from django.db import connection
 from django.db.models import Q
+from django.utils import html
 from django.utils.safestring import mark_safe
 
@@ -31 +33 @@
 from util.emails import email_from_template
 
-
+urlvalidator = URLValidator()
+emailvalidator = EmailValidator(email_re)
 
 ############
@@ -822 +825 @@
         super(GroupReportingFilter, self).__init__(data, *args, **kwargs)
 
+def format_url(url):
+    try:
+        urlvalidator(url)
+    except ValidationError:
+        return url
+    else:
+        escaped = html.escape(url)
+        return mark_safe("<a href='%s'>%s</a>" % (escaped, escaped))
+
+def format_email(email):
+    try:
+        emailvalidator(email)
+    except ValidationError:
+        return email
+    else:
+        escaped = html.escape(email)
+        return mark_safe("<a href='mailto:%s'>%s</a>" % (escaped, escaped))
+
+
+def format_id(pk):
+    url = reverse('groups:group-detail', kwargs={'pk':pk})
+    return mark_safe("<a href='%s'>%d</a>" % (url, pk))
+
+reporting_html_formatters = {
+    'id': format_id,
+    'website_url': format_url,
+    'constitution_url': format_url,
+    'group_email': format_email,
+    'officer_email': format_email,
+}
+
 @permission_required('groups.view_group_private_info')
 def reporting(request, ):
@@ -843 +877 @@
         if prefetch_fields:
             qs = qs.select_related(*list(prefetch_fields))
+
+        # Assemble data
+        if output_format == 'html':
+            formatters = reporting_html_formatters
+        else:
+            formatters = {}
+        def fetch_item(group, field):
+            val = getattr(group, field)
+            if field in formatters:
+                val = formatters[field](val)
+            return val
         for group in qs:
-            group_data = [getattr(group, field) for field in basic_fields]
+            group_data = [fetch_item(group, field) for field in basic_fields]
             report_groups.append(group_data)