CAMP/rizk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ugly fixes

Browse Source
This commit is contained in:
sanj 2010-10-26 01:33:51 +02:00
parent 4b64fbf1bd
commit fccd5a49e0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rizk/egypt/models.py
View File

@ -72,9 +72,11 @@ class Image(models.Model):
else: else:
flickrPhoto = flickr.Photo(id=self.get_flickr_id()) flickrPhoto = flickr.Photo(id=self.get_flickr_id())
sizes = flickrPhoto.getSizes() sizes = flickrPhoto.getSizes()
photoInfo = flickrPhoto.getInfo()
ret = { ret = {
'url': self.url, 'url': self.url,
'sizes': sizes, 'sizes': sizes,
'photoInfo': photoInfo,
'caption': self.caption, 'caption': self.caption,
'location': { 'location': {
'id': self.location.id, 'id': self.location.id,
@ -99,8 +101,8 @@ class Event(models.Model):
return { return {
'name': self.name, 'name': self.name,
'description': self.description, 'description': self.description,
'start_time': self.start_time, 'start_time': self.start_time.strftime("%Y-%m-%d"),
'end_time': self.end_time 'end_time': self.end_time.strftime("%Y-%m-%d")
} }
def get_media(self): def get_media(self):
@ -150,7 +152,7 @@ class YoutubeVideo(models.Model):
else: else:
youtube_id = self.get_youtube_id() youtube_id = self.get_youtube_id()
info = youtube.getMovieInfo(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: #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],) info['thumbnail'] = "http://img.youtube.com/vi/%s/0.jpg" % (info['id'][:-22],)

1
rizk/settings.py
View File

@ -98,6 +98,7 @@ INSTALLED_APPS = (
'django.contrib.gis', 'django.contrib.gis',
'egypt', 'egypt',
'debug_toolbar', 'debug_toolbar',
'django_extensions',
) )
#overwrite default settings with local settings #overwrite default settings with local settings