Fixed line ending

This commit is contained in:
fergalmoran
2013-01-25 17:37:31 +00:00
parent 50a1a4c3c0
commit 5bafbc0b25
3 changed files with 3 additions and 4 deletions

View File

@@ -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

View File

@@ -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:

View File

@@ -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
pass