fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-05-01 00:51:19 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Remove merge conflicts

Browse Source
This commit is contained in:
fergalmoran
2012-10-27 19:22:53 +01:00
parent 82b4bb6700
commit fbb3195b32
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spa/api/v1/MixResource.py
View File

@@ -74,11 +74,7 @@ class MixResource(BackboneCompatibleResource):
bundle.data['item_url'] = 'mix/%s' % bundle.obj.id
bundle.data['play_count'] = bundle.obj.plays.count()
<<<<<<< HEAD
bundle.data['download_count'] = bundle.obj.download.count()
=======
bundle.data['download_count'] = bundle.obj.downloads.count()
>>>>>>> e98519493cf82785f319ad65cafa3c8eb09250b3
bundle.data['like_count'] = bundle.obj.likes.count()
bundle.data['mode'] = 'mix'
bundle.data['tooltip'] = render_to_string('inc/player_tooltip.html', {'item': bundle.obj})