From b22f49366481a84ab9707457614f4b352e50ed90 Mon Sep 17 00:00:00 2001 From: Ed Woodward Date: Mon, 13 Sep 2021 11:22:07 -0500 Subject: [PATCH 1/2] Update partner fields based on locale --- books/models.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/books/models.py b/books/models.py index d0ef11d3f..6ec72e5ce 100644 --- a/books/models.py +++ b/books/models.py @@ -834,22 +834,22 @@ def save(self, *args, **kwargs): self.webview_link = '{}contents/{}'.format(settings.CNX_URL, self.cnx_id) if self.partner_list_label: - Book.objects.all().update(partner_list_label=self.partner_list_label) + Book.objects.filter(locale=self.locale).update(partner_list_label=self.partner_list_label) if self.partner_page_link_text: - Book.objects.all().update(partner_page_link_text=self.partner_page_link_text) + Book.objects.filter(locale=self.locale).update(partner_page_link_text=self.partner_page_link_text) # sync customization form changes on all books if self.customization_form_heading: - Book.objects.all().update(customization_form_heading=self.customization_form_heading) + Book.objects.filter(locale=self.locale).update(customization_form_heading=self.customization_form_heading) if self.customization_form_subheading: - Book.objects.all().update(customization_form_subheading=self.customization_form_subheading) + Book.objects.filter(locale=self.locale).update(customization_form_subheading=self.customization_form_subheading) if self.customization_form_disclaimer: - Book.objects.all().update(customization_form_disclaimer=self.customization_form_disclaimer) + Book.objects.filter(locale=self.locale).update(customization_form_disclaimer=self.customization_form_disclaimer) if self.customization_form_next_steps: - Book.objects.all().update(customization_form_next_steps=self.customization_form_next_steps) + Book.objects.filter(locale=self.locale).update(customization_form_next_steps=self.customization_form_next_steps) if self.support_statement: - Book.objects.all().update(support_statement=self.support_statement) + Book.objects.filter(locale=self.locale).update(support_statement=self.support_statement) return super(Book, self).save(*args, **kwargs) From ed3900b4590ac89eea5d81a651e3b0ab539d6e01 Mon Sep 17 00:00:00 2001 From: Ed Woodward Date: Mon, 13 Sep 2021 13:10:44 -0500 Subject: [PATCH 2/2] Fixed tests needing locales --- books/tests.py | 8 ++++++++ errata/tests.py | 1 + 2 files changed, 9 insertions(+) diff --git a/books/tests.py b/books/tests.py index 662abb30b..afca43bd3 100644 --- a/books/tests.py +++ b/books/tests.py @@ -41,6 +41,7 @@ def setUpTestData(cls): def test_can_create_book(self): book_index = BookIndex.objects.all()[0] + root_page = Page.objects.get(title="Root") book = Book(title="University Physics", slug="university-physics", cnx_id='031da8d3-b525-429c-80cf-6c8ed997733a', @@ -50,12 +51,14 @@ def test_can_create_book(self): cover=self.test_doc, title_image=self.test_doc, publish_date=datetime.date.today(), + locale=root_page.locale ) book_index.add_child(instance=book) self.assertEqual(book.salesforce_abbreviation, 'University Phys (Calc)') def test_can_create_ap_book(self): book_index = BookIndex.objects.all()[0] + root_page = Page.objects.get(title="Root") book = Book(title="Prealgebra", slug="prealgebra", salesforce_abbreviation='Prealgebra', @@ -65,6 +68,7 @@ def test_can_create_ap_book(self): cover=self.test_doc, title_image=self.test_doc, publish_date=datetime.date.today(), + locale=root_page.locale ) book_index.add_child(instance=book) self.assertEqual(book.salesforce_abbreviation, 'Prealgebra') @@ -72,6 +76,7 @@ def test_can_create_ap_book(self): def test_can_create_book_without_cnx_id(self): book_index = BookIndex.objects.all()[0] + root_page = Page.objects.get(title="Root") book = Book(title="Prealgebra", slug="prealgebra", salesforce_abbreviation='Prealgebra', @@ -80,12 +85,14 @@ def test_can_create_book_without_cnx_id(self): cover=self.test_doc, title_image=self.test_doc, publish_date=datetime.date.today(), + locale=root_page.locale ) book_index.add_child(instance=book) self.assertEqual(book.salesforce_abbreviation, 'Prealgebra') def test_only_numbers_for_price(self): book_index = BookIndex.objects.all()[0] + root_page = Page.objects.get(title="Root") book = Book(title="Prealgebra", slug="prealgebra", salesforce_abbreviation='Prealgebra', @@ -94,6 +101,7 @@ def test_only_numbers_for_price(self): cover=self.test_doc, title_image=self.test_doc, publish_date=datetime.date.today(), + locale=root_page.locale ) book_index.add_child(instance=book) self.assertEqual(book.salesforce_abbreviation, 'Prealgebra') diff --git a/errata/tests.py b/errata/tests.py index 811a7375c..8c04ab385 100644 --- a/errata/tests.py +++ b/errata/tests.py @@ -40,6 +40,7 @@ def setUp(self): cover=test_doc, title_image=test_doc, publish_date=datetime.date.today(), + locale=root_page.locale ) book_index.add_child(instance=book)