0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

merging changes

Browse source
This commit is contained in:
rolux 2011-08-19 06:40:49 +00:00
commit 5366941bc1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/models.py
View file

@ -529,7 +529,7 @@ class Stream(models.Model):
def json(self): def json(self):
if settings.XSENDFILE or settings.XACCELREDIRECT: if settings.XSENDFILE or settings.XACCELREDIRECT:
base_url = '/%s' % self.file.itemId base_url = '/%s' % self.file.item.itemId
else: else:
base_url = os.path.dirname(self.video.url) base_url = os.path.dirname(self.video.url)
return { return {