Changeset 189506e

Timestamp:

May 13, 2010, 3:23:56 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, fysm-4-1, iframe, space-access, stable, stage, test-hooks

Children:

3d07eb0

Parents:

97399af

git-author:

Alex Dehnert <adehnert@…> (05/13/10 03:23:56)

git-committer:

Alex Dehnert <adehnert@…> (05/13/10 03:23:56)

Message:

Properly display categories

Location:

asadb

Files:

• forms/templatetags/__init__.py (added)
• forms/templatetags/formtags.py (added)
• forms/views.py (modified) (2 diffs)
• template/forms/fysm_listing.html (modified) (3 diffs)

asadb/forms/views.py

@@ -12 +12 @@
         category_obj = get_object_or_404(forms.models.FYSMTag, slug=category)
         queryset = queryset.filter(tags=category_obj)
-    print queryset
+    categories = forms.models.FYSMTag.objects.all()
     return list_detail.object_list(
         request,
@@ -22 +22 @@
             "pagename": "fysm",
             "category": category_obj,
+            "categories": categories,
         }
     )

asadb/template/forms/fysm_listing.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load formtags %}
 
 {% block title %}First Year Summer Mailing{% endblock %}
@@ -9 +10 @@
 <h2>{{category.name}} Groups</h2>
 <p>{{category.blurb}}</p>
+<p><a href='{% url fysm year %}'>Return to all categories</a></p>
+{% else %}
+<h3>Limit Group Categories</h3>
+<ul>
+{% for cat in categories %}
+<li><a href='{% url fysm year cat.slug %}'>{{cat}}</a></li>
+{% endfor %}
+</ul>
 {% endif %}
 
@@ -19 +28 @@
     <p class='data'>{{fysm.description}}</p>
     <p class='join'><a href='{{fysm.website}}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
-    <p class='tags'>tags: {{fysm.tags.all}}</p>
+    <p class='tags'>tags: {{fysm|format_categories:year}}</p>
 </div>
 {% endfor %}