merging changes
This commit is contained in:
commit
5366941bc1
1 changed files with 7 additions and 7 deletions
|
@ -529,7 +529,7 @@ class Stream(models.Model):
|
|||
|
||||
def json(self):
|
||||
if settings.XSENDFILE or settings.XACCELREDIRECT:
|
||||
base_url = '/%s' % self.file.itemId
|
||||
base_url = '/%s' % self.file.item.itemId
|
||||
else:
|
||||
base_url = os.path.dirname(self.video.url)
|
||||
return {
|
||||
|
|
Loading…
Reference in a new issue