diff --git a/spa/api/v1/ChatResource.py b/spa/api/v1/ChatResource.py deleted file mode 100644 index 5b19fa5..0000000 --- a/spa/api/v1/ChatResource.py +++ /dev/null @@ -1,6 +0,0 @@ -from spa.api.v1.BackboneCompatibleResource import BackboneCompatibleResource -from spa.models.ChatMessage import ChatMessage - -class CommentResource(BackboneCompatibleResource): - class Meta: - queryset = ChatMessage.objects.all().order_by('-timestamp') diff --git a/spa/api/v1/CommentResource.py b/spa/api/v1/CommentResource.py index 77d3a27..d2d6e6f 100644 --- a/spa/api/v1/CommentResource.py +++ b/spa/api/v1/CommentResource.py @@ -5,8 +5,9 @@ from tastypie.authentication import Authentication from tastypie.authorization import Authorization from spa.api.v1.BackboneCompatibleResource import BackboneCompatibleResource from spa.models.Comment import Comment +from tastypie.resources import ModelResource -class CommentResource(BackboneCompatibleResource): +class CommentResource(ModelResource): mix = fields.ToOneField('spa.api.v1.MixResource.MixResource', 'mix') class Meta: @@ -36,4 +37,4 @@ class CommentResource(BackboneCompatibleResource): bundle.data['avatar_image'] = bundle.obj.user.get_profile().get_small_profile_image() bundle.data['user_url'] = bundle.obj.user.get_absolute_url() bundle.data['user_name'] = bundle.obj.user.get_profile().nice_name() or bundle.obj.user.get_profile().display_name - return bundle \ No newline at end of file + return bundle diff --git a/spa/urls.py b/spa/urls.py index 6ba0ae5..15c031a 100644 --- a/spa/urls.py +++ b/spa/urls.py @@ -13,13 +13,15 @@ from spa.api.v1.ActivityResource import ActivityResource from spa.social import SocialHandler v1_api = Api(api_name='v1') -v1_api.register(MixResource()) v1_api.register(CommentResource()) +""" +v1_api.register(MixResource()) v1_api.register(ReleaseResource()) v1_api.register(ReleaseAudioResource()) v1_api.register(EventResource()) v1_api.register(UserResource()) v1_api.register(ActivityResource()) +""" ajax = AjaxHandler() audio = AudioHandler() @@ -40,4 +42,4 @@ urlpatterns = django.conf.urls.patterns( url(r'^api/', include(v1_api.urls)), url(r'^comments/', include('django.contrib.comments.urls')), (r'^.*/$', 'spa.views.default') -) \ No newline at end of file +)