From 5bafbc0b259a970035cc90d7bd9144dca5f5a2a8 Mon Sep 17 00:00:00 2001 From: fergalmoran Date: Fri, 25 Jan 2013 17:37:31 +0000 Subject: [PATCH] Fixed line ending --- spa/api/v1/MixResource.py | 3 +-- spa/models/Mix.py | 2 +- spa/models/_BaseModel.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spa/api/v1/MixResource.py b/spa/api/v1/MixResource.py index 545d43a..5efd793 100644 --- a/spa/api/v1/MixResource.py +++ b/spa/api/v1/MixResource.py @@ -78,8 +78,7 @@ class MixResource(BackboneCompatibleResource): bundle.data['is_featured'] = False bundle.data['user'] = request.user.get_profile() - ret = super(MixResource, self).obj_create(bundle, request, user=request.user.get_profile(), - local_file=file_name, uid=uid) + ret = super(MixResource, self).obj_create(bundle, request, user=request.user.get_profile(), local_file=file_name, uid=uid) self._unpackGenreList(ret, bundle.data['genre-list']) #if ret is hunky dory return ret diff --git a/spa/models/Mix.py b/spa/models/Mix.py index bf3ce34..6b4a429 100644 --- a/spa/models/Mix.py +++ b/spa/models/Mix.py @@ -84,7 +84,7 @@ class Mix(_BaseModel): def get_image_url(self): try: ret = get_thumbnail(self.mix_image, '160x160', crop='center') - return "%s/%s/%s" % (settings.STATIC_URL, settings.MEDIA_URL, ret.name) + return "%s/%s" % (settings.MEDIA_URL, ret.name) except Exception: social_image = self._get_social_image() if social_image: diff --git a/spa/models/_BaseModel.py b/spa/models/_BaseModel.py index 60af7ff..ce70630 100644 --- a/spa/models/_BaseModel.py +++ b/spa/models/_BaseModel.py @@ -53,4 +53,4 @@ class _BaseModel(models.Model): if old_instance is not None: self.__dict__[image_field] = old_instance.__dict__[image_field] except Exception, ex: - pass \ No newline at end of file + pass