--- a/qrurls/views.py Sat Sep 07 16:00:13 2013 +0300
+++ b/qrurls/views.py Sat Sep 07 16:15:34 2013 +0300
@@ -42,26 +42,21 @@
"""
Frontend for a specific item.
"""
-
- try :
- url_item = URLItem.get_item(shorturl, item_id=item_id,
- related=('shorturl', 'image'),
- )
+
+ try:
+ data = URLItem.get_item(shorturl, int(item_id))
except URLItem.DoesNotExist:
raise Http404()
- if url_item.url :
- response = HttpResponseRedirect(url_item.url)
- elif url_item.image :
- response = render(request, 'qrurls/image.html', dict(
- title = url_item.title(),
- image = url_item.image.get_absolute_url(),
- ))
+ if data['url'] :
+ response = HttpResponseRedirect(data['url'])
+ elif data['image'] :
+ response = render(request, 'qrurls/image.html', data)
else :
raise Http404()
# set cache
response['Vary'] = ''
- response['Last-Modified'] = http_datetime(url_item.last_modified())
+ response['Last-Modified'] = data['last_modified']
return response