From fccd5a49e0c632ac8887d437a88a0d4e56304834 Mon Sep 17 00:00:00 2001 From: sanj Date: Tue, 26 Oct 2010 01:33:51 +0200 Subject: [PATCH] ugly fixes --- rizk/egypt/models.py | 8 +++++--- rizk/settings.py | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rizk/egypt/models.py b/rizk/egypt/models.py index a1b794e..bd7ce0c 100644 --- a/rizk/egypt/models.py +++ b/rizk/egypt/models.py @@ -72,9 +72,11 @@ class Image(models.Model): else: flickrPhoto = flickr.Photo(id=self.get_flickr_id()) sizes = flickrPhoto.getSizes() + photoInfo = flickrPhoto.getInfo() ret = { 'url': self.url, 'sizes': sizes, + 'photoInfo': photoInfo, 'caption': self.caption, 'location': { 'id': self.location.id, @@ -99,8 +101,8 @@ class Event(models.Model): return { 'name': self.name, 'description': self.description, - 'start_time': self.start_time, - 'end_time': self.end_time + 'start_time': self.start_time.strftime("%Y-%m-%d"), + 'end_time': self.end_time.strftime("%Y-%m-%d") } def get_media(self): @@ -150,7 +152,7 @@ class YoutubeVideo(models.Model): else: youtube_id = self.get_youtube_id() info = youtube.getMovieInfo(youtube_id) - info['title'] = '' #Nasty, to avoid UnicodeDecodeError's when trying to do json.dumps on some video titles. FIXME. +# info['title'] = '' #Nasty, to avoid UnicodeDecodeError's when trying to do json.dumps on some video titles. FIXME. #this is just ugly -- this shud be fixed by oxweb -- please remove when necessary: info['thumbnail'] = "http://img.youtube.com/vi/%s/0.jpg" % (info['id'][:-22],) diff --git a/rizk/settings.py b/rizk/settings.py index 1fec6d1..fddd214 100644 --- a/rizk/settings.py +++ b/rizk/settings.py @@ -98,6 +98,7 @@ INSTALLED_APPS = ( 'django.contrib.gis', 'egypt', 'debug_toolbar', + 'django_extensions', ) #overwrite default settings with local settings