--- a/qrurls/models.py	Thu Aug 15 01:38:08 2013 +0300
+++ b/qrurls/models.py	Thu Aug 15 01:39:18 2013 +0300
@@ -126,10 +126,10 @@
         ordering = ['published']
 
     def get_absolute_url (self) :
-        if self.image :
-            return reverse('shorturl_image', kwargs=dict(shorturl=self.shorturl, item_id=self.id))
+        if self.url :
+            return self.url
         else :
-            return self.url
+            return reverse('shorturl_item', kwargs=dict(shorturl=self.shorturl, item_id=self.id))
     
     def published_age (self) :
         now = timezone.now()

--- a/qrurls/urls.py	Thu Aug 15 01:38:08 2013 +0300
+++ b/qrurls/urls.py	Thu Aug 15 01:39:18 2013 +0300
@@ -6,5 +6,5 @@
     url(r'^(?P<shorturl_id>\d+)$', qrurls.views.shorturl, name='miniurl'),
     url(r'^(?P<shorturl>\w+)$', qrurls.views.shorturl, name='shorturl'),
     
-    url(r'^(?P<shorturl>\w+)/(?P<item_id>\d+)$', qrurls.views.image, name='shorturl_image'),
+    url(r'^(?P<shorturl>\w+)/(?P<item_id>\d+)$', qrurls.views.item, name='shorturl_item'),
 )

--- a/qrurls/views.py	Thu Aug 15 01:38:08 2013 +0300
+++ b/qrurls/views.py	Thu Aug 15 01:39:18 2013 +0300
@@ -40,7 +40,7 @@
 
     return HttpResponseRedirect(url)
     
-def image (request, shorturl, item_id) :
+def item (request, shorturl, item_id) :
     url_feed = _get_url_feed(shorturl=shorturl)
 
     now = timezone.now()
@@ -49,12 +49,12 @@
     except URLItem.DoesNotExist :
         raise Http404()
     
-    if url_item.image :
+    if url_item.url :
+        return HttpResponseRedirect(url_item.url)
+    elif url_item.image :
         return render(request, 'qrurls/image.html', dict(
             title   = url_item.image.title,
             image   = url_item.image,
         ))
-    elif url_item.url :
-        return HttpResponseRedirect(url_item.url)
     else :
         raise Http404()