From fec91e7f0abe5765a07f818665f5a86f8a592b7f Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 24 Apr 2014 22:01:50 +0100 Subject: [PATCH] Fixed user edit and search for non featured mixes --- spa/api/v1/MixResource.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spa/api/v1/MixResource.py b/spa/api/v1/MixResource.py index 4b59f55..a56d5d7 100755 --- a/spa/api/v1/MixResource.py +++ b/spa/api/v1/MixResource.py @@ -154,7 +154,8 @@ class MixResource(BackboneCompatibleResource): user__in=request.user.get_profile().following.all()) if f_user is not None: semi_filtered = semi_filtered.filter(user__slug=f_user) - else: + + if len(applicable_filters) == 0: semi_filtered = semi_filtered.filter(is_featured=True) return semi_filtered @@ -184,7 +185,7 @@ class MixResource(BackboneCompatibleResource): if bundle.request.user.is_authenticated(): bundle.data['can_edit'] = bundle.request.user.is_staff or \ - bundle.obj.user_id == bundle.request.user.id + bundle.obj.user_id == bundle.request.user.get_profile().id else: bundle.data['can_edit'] = False