fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2026-01-06 08:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Fergal Moran
2016-06-28 21:06:23 +01:00
parent e7bd7a8df6 9032bcbd4e
commit ced7a89660
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/views.py
View File

@@ -177,8 +177,10 @@ class SearchResultsView(views.APIView):
else:
r_s = [
{
'id': mix.id,
'title': mix.title,
'image': mix.get_image_url(),
'image': mix.get_image_url(size='48x48'),
'user': mix.user.slug,
'slug': mix.slug,
'user': mix.user.slug,
'url': mix.get_absolute_url(),

2
spa/models/mix.py
View File

@@ -138,7 +138,7 @@ class Mix(BaseModel):
return '%s/mixes/%s%s.%s' % (settings.MEDIA_ROOT, prefix, self.uid, self.filetype)
def get_absolute_url(self):
return '/mix/%s' % self.slug
return '/%s/%s' % (self.user.slug, self.slug)
def get_full_url(self):
return 'http://%s%s' % (Site.objects.get_current().domain, self.get_absolute_url())