From 7738ac2779ec2c7e64cbf339aaa36a43c6416167 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 22 Oct 2011 14:58:21 +0200 Subject: [PATCH] baseUrl unused --- pandora/archive/models.py | 5 ----- pandora/user/views.py | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 449083a0..5e963375 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -504,14 +504,9 @@ class Stream(models.Model): self.file.save() def json(self): - if settings.XSENDFILE or settings.XACCELREDIRECT: - base_url = '/%s' % self.file.item.itemId - else: - base_url = os.path.dirname(self.video.url) return { 'duration': self.duration, 'aspectRatio': self.aspect_ratio, - 'baseUrl': base_url } def delete_stream(sender, **kwargs): diff --git a/pandora/user/views.py b/pandora/user/views.py index d7a5a586..a5bd5f97 100644 --- a/pandora/user/views.py +++ b/pandora/user/views.py @@ -366,7 +366,8 @@ def findUser(request): ''' param data { key: "username", - value: "foo", operator: "=" + value: "foo", + operator: "==" keys: [] }