Skip to content

ErrataContent snippets translated in books and in snippets API #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2021
Merged

ErrataContent snippets translated in books and in snippets API #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fee9be
ErrataContent snippets translated in books and in snippets API
edwoodward Jul 22, 2021
286f053
Cleaned up errata_content code
edwoodward Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions books/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,7 @@ def subjects(self):

@property
def errata_content(self):
e_content = snippets.ErrataContent.objects.filter(book_state=self.book_state)
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)
Expand Down
3 changes: 3 additions & 0 deletions snippets/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down