Changeset 4bf8692

Timestamp:

Sep 24, 2012, 12:50:48 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

43d4ccb

Parents:

75238d5

git-author:

Alex Dehnert <adehnert@…> (09/24/12 00:35:52)

git-committer:

Alex Dehnert <adehnert@…> (09/24/12 00:50:48)

Message:

Add and use constitution linkifying filter (ASA-#146)

Location:

asadb

Files:

• groups/templatetags/__init__.py (added)
• groups/templatetags/groupdisplay.py (added)
• groups/views.py (modified) (1 diff)
• template/groups/group_detail.html (modified) (2 diffs)
• template/groups/groups_constitutions.reason.html (modified) (2 diffs)

asadb/groups/views.py

@@ -82 +82 @@
         context = super(GroupDetailView, self).get_context_data(**kwargs)
         group = context['group']
-
-        const_link = None
-        const_url = group.constitution_url
-        if const_url.startswith("http://") or const_url.startswith("https://"):
-            const_link = const_url
-        context['constitution_link'] = const_link
 
         # Indicate whether this person should be able to see "private" info

asadb/template/groups/group_detail.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load groupdisplay %}
 
 {% block title %}{{group.name}}{% endblock %}
@@ -72 +73 @@
 <tr class='private-info'>
     <th>Constitution</th>
-    <td>{% if group.constitution_url %}
-        {% if constitution_link %}<a href='{{group.constitution_url}}'>{{group.constitution_url}}</a>
-        {%else%}{{group.constitution_url}}{%endif%}
-    {%else%}<i>not provided</i>{%endif%}</td>
+    <td>{{group.constitution_url|format_constitution_link}}</td>
 </tr>
 {% endif %}

asadb/template/groups/groups_constitutions.reason.html

@@ +1 @@
+{% load groupdisplay %}
 <h3><a name='{{reason|slugify}}'></a>{{reason}} (total: {{consts|length}})</h3>
 <table class='pretty-table'>
@@ -16 +17 @@
     <td><a href='{% url groups:group-detail const.group.pk %}'>{{const.group.name}}</a>{% if const.group.group_status.slug != "active" %} ({{const.group.group_status}}){%endif%}</td>
     <td>{{const.pk}}</td>
-    <td>{{const.source_url}}</td>
+    <td>{{const.source_url|format_constitution_link}}</td>
     <td>{{const.failure_date}}</td>
 </tr>