Changeset aba463b

Timestamp:

May 13, 2010, 12:59:06 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

493de25

Parents:

5bd0b4c

git-author:

Alex Dehnert <adehnert@…> (05/13/10 00:58:16)

git-committer:

Alex Dehnert <adehnert@…> (05/13/10 00:59:06)

Message:

Whoo, basic FYSM support

Location:

asadb

Files:

• forms/admin.py (modified) (1 diff)
• forms/models.py (modified) (2 diffs)
• forms/views.py (modified) (1 diff)
• template/forms/fysm_listing.html (added)
• urls.py (modified) (3 diffs)

asadb/forms/admin.py

@@ -11 +11 @@
     list_display_links = ('group', 'year', )
 
+class FYSMTagsAdmin(admin.ModelAdmin):
+    list_display = (
+        'name',
+    )
 
 admin.site.register(forms.models.FYSM, FYSMAdmin)
+admin.site.register(forms.models.FYSMTags, FYSMTagsAdmin)

asadb/forms/models.py

@@ -9 +9 @@
     year = models.IntegerField()
     website = models.URLField()
+    join_url = models.URLField()
     contact_email = models.EmailField()
     description = models.TextField()
@@ -20 +21 @@
     name = models.CharField(max_length=10)
     blurb = models.TextField()
+
+    def __str__(self, ):
+        return self.name

asadb/forms/views.py

@@ -1 @@
-# Create your views here.
+import forms.models
+from django.views.generic import list_detail
+from django.shortcuts import render_to_response, get_object_or_404
+
+import datetime
+
+def fysm_by_years(request, _, year):
+    if year is None: year = datetime.date.today().year
+    queryset = forms.models.FYSM.objects.filter(year=year).order_by('group__name')
+    print queryset
+    return list_detail.object_list(
+        request,
+        queryset=queryset,
+        template_name="forms/fysm_listing.html",
+        template_object_name="fysm",
+        extra_context={
+            "year": year,
+            "pagename": "fysm",
+        }
+    )

asadb/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 from django.contrib.auth.views import login, logout
+from django.views.generic import list_detail
 
 # Uncomment the next two lines to enable the admin:
@@ -7 +8 @@
 
 import settings
+
+import forms.views
 
 urlpatterns = patterns('',
@@ -17 +20 @@
         name='homepage',
     ),
+
+    # FYSM
+    url(r'^fysm/((\d+)/)?$', forms.views.fysm_by_years, name='fysm', ),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'