Assembla home | Assembla project page
 

Changeset 97

Show
Ignore:
Timestamp:
01/26/09 00:59:41 (1 year ago)
Author:
aarkerio
Message:

Update Polls

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/polls/templatetags/poll_extras.py

    r96 r97  
    2121    poll = Poll.objects.filter(published=True).order_by("-id")[0] 
    2222    return {'poll':poll} 
    23      
    2423register.inclusion_tag('polls/votes.html')(view_results) 
    2524 

  • trunk/polls/urls.py

    r96 r97  
    77  (r'^view/(\d{1,4})/$', views.view), 
    88  (r'^results/(\d{1,4})/$', views.results), 
    9   (r'^(?P<poll_id>\d+)/vote/$', views.vote), 
    10   (r'^refresh/$', 'refresh'), 
    11   (r'^add/$', views.add), 
     9  (r'^addvote/$', views.addvote), 
    1210) 
    1311 

  • trunk/polls/views.py

    r96 r97  
    2222 
    2323    try: 
    24        #poll = Poll.objects.filter(published=True).order_by("-id")[:1] 
    25        poll = Poll.objects.get(pk=poll_id) 
     24       poll = Poll.objects.filter(published=True).order_by("-id")[0] 
     25       #poll = Poll.objects.get(pk=poll_id) 
    2626       mydict = {'poll':poll} 
    2727       #exit(raise Exception(repr(post))) 

  • trunk/templates/portal.html

    r96 r97  
    6161{% last_posts %} 
    6262 
    63 {# #} 
     63 
    6464{# Show the poll #} 
    6565{%  if not request.session.has_voted  %} 
    6666    {% view_poll %} 
    67 {% else %} 
    68     {% view_results % } 
    69 {& endif &} 
     67{# % else % #} 
     68    {# % view_results % #} 
     69{% endif %} 
    7070 
    7171{% include 'elements/nav.html' %}