Fix lists with missing translations

onepercentclub · Aug 23, 2022 · 6981562 · 6981562
1 parent f08cc89
commit 6981562
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/bluebottle/initiatives/tests/test_api.py b/bluebottle/initiatives/tests/test_api.py
@@ -1480,6 +1480,53 @@ def test_detail_disabled(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
+    def test_detail_translation(self):
+        theme = ThemeFactory.create(slug='world', name='Zooi')
+        theme.set_current_language('en')
+        theme.name = 'World domination'
+        theme.save()
+        url = reverse('initiative-theme', args=(theme.id,))
+        response = self.client.get(
+            url,
+            user=self.user,
+            HTTP_X_APPLICATION_LANGUAGE='en'
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        result = response.json()['data']
+        self.assertEqual(result['attributes']['name'], 'World domination')
+
+    def test_detail_translation_missing(self):
+        theme = ThemeFactory.create(slug='world')
+        theme.set_current_language('en')
+        theme.name = 'World domination'
+        theme.save()
+        url = reverse('initiative-theme', args=(theme.id,))
+        response = self.client.get(
+            url,
+            user=self.user,
+            HTTP_X_APPLICATION_LANGUAGE='nl'
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        result = response.json()['data']
+        self.assertEqual(result['attributes']['name'], 'World domination')
+
+    def test_detail_translation_nl(self):
+        theme = ThemeFactory.create(slug='world')
+        theme.set_current_language('en')
+        theme.name = 'World domination'
+        theme.set_current_language('nl')
+        theme.name = 'Wereldoverheersing'
+        theme.save()
+        url = reverse('initiative-theme', args=(theme.id,))
+        response = self.client.get(
+            url,
+            user=self.user,
+            HTTP_X_APPLICATION_LANGUAGE='nl'
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        result = response.json()['data']
+        self.assertEqual(result['attributes']['name'], 'Wereldoverheersing')
+
 
 class ThemeApiTestCase(BluebottleTestCase):
 

diff --git a/bluebottle/utils/views.py b/bluebottle/utils/views.py
@@ -232,7 +232,7 @@ def get_queryset(self):
 
 class TranslatedApiViewMixin(object):
     def get_queryset(self):
-        qs = super(TranslatedApiViewMixin, self).get_queryset().translated(
+        qs = super(TranslatedApiViewMixin, self).get_queryset().active_translations(
             get_language()
         )
         qs = qs.order_by(*qs.model._meta.ordering)