Changeset f462be6

Timestamp:

May 22, 2010, 11:17:46 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

1f94b84

Parents:

e4773d4

git-author:

Alex Dehnert <adehnert@…> (05/22/10 23:17:46)

git-committer:

Alex Dehnert <adehnert@…> (05/22/10 23:17:46)

Message:

Use intermediate page for join links

Location:

asadb

Files:

• forms/views.py (modified) (1 diff)
• template/fysm/fysm_listing.html (modified) (1 diff)
• urls.py (modified) (1 diff)

asadb/forms/views.py

@@ -100 +100 @@
     )
 
+def fysm_link(request, year, link_type, submission, ):
+    submit_obj = get_object_or_404(forms.models.FYSM, pk=submission,)
+    if submit_obj.year != int(year):
+        raise Http404("Year mismatch: fysm.year='%s', request's year='%s'" % (submit_obj.year, year, ))
+    if link_type == 'join':
+        url = submit_obj.join_url
+    elif link_type == 'website':
+        url = submit_obj.website
+    else:
+        raise Http404("Unknown link type")
+    return HttpResponseRedirect(url)
+
 def select_group_fysm(request, ):
     qobj = Q(activity_category__name='Dorm') | Q(activity_category__name='FSILG')

asadb/template/fysm/fysm_listing.html

@@ -32 +32 @@
     </div>
     <p class='data'>{{fysm.description}}</p>
-    <p class='join'><a href='{{fysm.join_url}}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
+    <p class='join'><a href='{% url fysm-link year "join" fysm.pk %}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
     </div>
     {% if fysm.tags %}

asadb/urls.py

@@ -30 +30 @@
     url(r'^fysm/submit/thanks/(\d+)/$', forms.views.fysm_thanks, name='fysm-thanks', ),
     url(r'^fysm/(\d+)/view/(\d+)/$', forms.views.fysm_view, name='fysm-view', ),
+    url(r'^fysm/(\d+)/(join|website)/(\d+)/$', forms.views.fysm_link, name='fysm-link', ),
     url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),