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

Fixed broken activity child on MixResource

Browse Source
This commit is contained in:
Fergal Moran
2013-01-25 17:37:03 +00:00
parent e04015c0d2
commit 9fc02b03a1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,23 @@
from django.conf.urls import url
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
from django.core.exceptions import ObjectDoesNotExist
from django.template.loader import render_to_string
from tastypie import fields
from tastypie.authorization import Authorization
from tastypie.constants import ALL_WITH_RELATIONS
from tastypie.http import HttpMultipleChoices, HttpGone
from tastypie.http import HttpGone
from tastypie.utils import trailing_slash
from core.serialisers import json
from spa.api.v1.ActivityResource import ActivityResource
from spa.api.v1.BackboneCompatibleResource import BackboneCompatibleResource
from spa.api.v1.CommentResource import CommentResource
from spa.models import Genre
from tastypie.utils import trailing_slash
from spa.models.Mix import Mix
class MixResource(BackboneCompatibleResource):
comments = fields.ToManyField('spa.api.v1.CommentResource.CommentResource', 'comments', 'mix', null=True)
activity = fields.ToManyField('spa.api.v1.ActivityResource.ActivityResource', 'activity', 'mix', null=True)
#activity = fields.ToManyField('spa.api.v1.ActivityResource.ActivityResource', 'activity', 'mix', null=True)
class Meta:
queryset = Mix.objects.filter(is_active=True)
@@ -51,7 +51,7 @@ class MixResource(BackboneCompatibleResource):
(self._meta.resource_name, trailing_slash()), self.wrap_view('get_comments'), name="api_get_comments"),
url(r"^(?P<resource_name>%s)/(?P<pk>\w[\w/-]*)/activity%s$" %
(self._meta.resource_name, trailing_slash()), self.wrap_view('get_activity'), name="api_get_activity"),
]
]
def get_comments(self, request, **kwargs):
try:
@@ -79,7 +79,7 @@ class MixResource(BackboneCompatibleResource):
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)
local_file=file_name, uid=uid)
self._unpackGenreList(ret, bundle.data['genre-list'])
#if ret is hunky dory
return ret