--- a/qrurls/models.py Fri Sep 06 01:25:16 2013 +0300
+++ b/qrurls/models.py Fri Sep 06 01:34:25 2013 +0300
@@ -218,6 +218,12 @@
# XXX: this asumes that URLImage is never changed after publishing..
return self.published
+ def title (self) :
+ if self.image and self.image.title.strip() :
+ return self.image.title
+ else :
+ return self.shorturl.title
+
def __unicode__ (self) :
return u"{published_state} {url}".format(
published_state=self.published_state(),
--- a/qrurls/views.py Fri Sep 06 01:25:16 2013 +0300
+++ b/qrurls/views.py Fri Sep 06 01:34:25 2013 +0300
@@ -88,10 +88,8 @@
if url_item.url :
response = HttpResponseRedirect(url_item.url)
elif url_item.image :
- title = url_item.image.title or url_item.shorturl.title
-
response = render(request, 'qrurls/image.html', dict(
- title = title,
+ title = url_item.title(),
image = url_item.image,
))
else :