Merge pull request #4853 from onepercentclub/hotfix/slot-contributor

Fix the current user slot participant

bluebottle/activities/utils.py

@@ -168,6 +168,7 @@ class JSONAPIMeta(object):
             'initiative',
             'goals',
             'goals.type',
+            'initiative.owner',
             'initiative.place',
             'initiative.location',
             'initiative.activity_managers',

bluebottle/bb_accounts/tests/test_api.py

@@ -27,7 +27,7 @@
     OrganizationFactory, OrganizationContactFactory
 )
 from bluebottle.test.factory_models.geo import CountryFactory, PlaceFactory
-from bluebottle.test.utils import BluebottleTestCase
+from bluebottle.test.utils import BluebottleTestCase, APITestCase
 
 ASSERTION_MAPPING = {
     'assertion_mapping': {
@@ -754,3 +754,22 @@ def test_token_expired(self):
             data={'user_id': self.user.pk, 'token': token}
         )
         self.assertEqual(response.status_code, 404)
+
+
+class MemberDetailViewAPITestCase(APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.user1 = BlueBottleUserFactory()
+        self.user2 = BlueBottleUserFactory()
+        self.model = self.user1
+        self.url = reverse('member-detail', args=(self.user1.id,))
+
+    def test_get_current_user(self):
+        self.perform_get(user=self.user1)
+        self.assertStatus(status.HTTP_200_OK)
+        self.assertEqual(self.response.data['id'], self.user1.id)
+
+    def test_get_other_user(self):
+        self.perform_get(user=self.user2)
+        self.assertStatus(status.HTTP_200_OK)
+        self.assertEqual(self.response.data['id'], self.user1.id)

bluebottle/bb_accounts/views.py

@@ -159,12 +159,7 @@ class MemberDetail(JsonApiViewMixin, AutoPrefetchMixin, RetrieveAPIView):
     queryset = USER_MODEL.objects.all()
     serializer_class = MemberSerializer
 
-    permission_classes = (CurrentUserPermission, )
-
-    def get_object(self):
-        if isinstance(self.request.user, AnonymousUser):
-            raise Http404()
-        return self.request.user
+    permission_classes = [IsAuthenticatedOrOpenPermission]
 
 
 class CurrentUser(RetrieveAPIView):