From 8fee9be87638ee5e3183f6790ab0e7a9ffc50356 Mon Sep 17 00:00:00 2001 From: Ed Woodward Date: Thu, 22 Jul 2021 08:44:37 -0500 Subject: [PATCH 1/2] ErrataContent snippets translated in books and in snippets API --- books/models.py | 2 +- snippets/views.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/books/models.py b/books/models.py index 2103a1ad3..5c119d766 100644 --- a/books/models.py +++ b/books/models.py @@ -802,7 +802,7 @@ def subjects(self): @property def errata_content(self): - e_content = snippets.ErrataContent.objects.filter(book_state=self.book_state) + e_content = snippets.ErrataContent.objects.filter(book_state=self.book_state, locale=self.locale) return e_content.first().content def get_slug(self): diff --git a/snippets/views.py b/snippets/views.py index f85159ffc..7c886b57a 100644 --- a/snippets/views.py +++ b/snippets/views.py @@ -36,8 +36,11 @@ class ErrataContentViewSet(viewsets.ModelViewSet): def get_queryset(self): queryset = ErrataContent.objects.all() book_state = self.request.query_params.get('book_state', None) + locale = self.request.query_params.get('locale', None) if book_state is not None: queryset = queryset.filter(book_state=book_state) + if locale is not None: + queryset = queryset.filter(locale=convert_locale(locale)) return queryset From 286f053a91a59b1815c6dc28222baf34954cfdd6 Mon Sep 17 00:00:00 2001 From: Ed Woodward Date: Thu, 22 Jul 2021 09:08:34 -0500 Subject: [PATCH 2/2] Cleaned up errata_content code --- books/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/books/models.py b/books/models.py index 5c119d766..985465359 100644 --- a/books/models.py +++ b/books/models.py @@ -802,8 +802,7 @@ def subjects(self): @property def errata_content(self): - e_content = snippets.ErrataContent.objects.filter(book_state=self.book_state, locale=self.locale) - return e_content.first().content + return snippets.ErrataContent.objects.filter(book_state=self.book_state, locale=self.locale).first().content def get_slug(self): return 'books/{}'.format(self.slug)