Browse files

Merge pull request #118 from rossbruniges/quick-bugs

Quick bugs - including fix for #117
  • Loading branch information...
2 parents 01740b5 + ea98b79 commit 3c70ae6bc60beb36255dcdb88f0d0b5280a75683 @rossbruniges rossbruniges committed Feb 13, 2013
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -168,6 +168,16 @@ <h2 class="fn exclaim">Lisa Brewster</h2> - <span class="org">Mozilla</span>
<article class="vcard">
+ <h2 class="fn exclaim">Tom Kenyon</h2> - <span class="org">Nesta</span>
+ </header>
+ <img class="photo" src="{{ static('base/img/judges/tom-kenyon.jpg') }}" width="120" height="120" />
+ <p class="whimper">Tom is programme director of the education in a digital environment programme which is exploring ways that the proliferation of digital technologies can transform education.</p>
+ <p class="whimper">Tom joined Nesta in April 2012. Before joining Nesta he worked as a digital executive producer for broadcasters and production companies specialising in the development of innovative products for children and young people.</p>
+ <p class="whimper">As head of digital for Jamie Oliver's production company, Fresh One, Tom led a major partnership between Channel 4, Google and others to create an online educational resource building on the values of Jamie's Dream School.</p>
+ <p class="whimper">Tom also worked for the BBC where he led digital development teams at CBBC and CBeebies to create online games and learning products for brands such as Tracy Beaker, Live and Deadly and Blue Peter. He also worked for where he executive produced the interactive drama Primeval Evolved which won an international EMMY award for Digital Fiction.</p>
+ </article>
+ <article class="vcard">
+ <header>
<h2 class="fn exclaim">Greg Trefry</h2> - <span class="org">NYU Game Studio</span>
<img class="photo" src="{{ static('base/img/judges/Trefry.jpg') }}" width="120" height="120" />
@@ -2,7 +2,7 @@
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.conf import settings
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, Http404
from django.template.defaultfilters import slugify
from django.contrib.auth.decorators import login_required
@@ -79,7 +79,7 @@ def edit_entry(request, slug, template='submissions/edit.html'):
def list(request, category='all', template='submissions/list.html'):
page_number = get_page(request.GET)
- if category == 'all':
+ if category == 'all':
entry_set = Entry.objects.all().order_by('-pk')
page_category = False
@@ -97,7 +97,13 @@ def list(request, category='all', template='submissions/list.html'):
def single(request, slug, template='submissions/single.html'):
+ # throwing a 404 is MUCH better than a 500 eh?
+ try:
+ entry = Entry.objects.get(slug=slug)
+ except Entry.DoesNotExist:
+ raise Http404
data = {
- 'entry': Entry.objects.get(slug=slug),
+ 'entry': entry,
return render(request, template, data)

0 comments on commit 3c70ae6

Please sign in to comment.