diff --git a/network-api/networkapi/campaign/views.py b/network-api/networkapi/campaign/views.py index c7a60df23c1..f722d091393 100644 --- a/network-api/networkapi/campaign/views.py +++ b/network-api/networkapi/campaign/views.py @@ -12,6 +12,7 @@ import json from networkapi.wagtailpages.models import Petition, Signup + def process_lang_code(lang): # Salesforce expects "pt" instead of "pt-BR". # See https://github.com/mozilla/foundation.mozilla.org/issues/5993 diff --git a/network-api/networkapi/wagtailpages/pagemodels/base.py b/network-api/networkapi/wagtailpages/pagemodels/base.py index 417235083bf..24b810ab210 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/base.py +++ b/network-api/networkapi/wagtailpages/pagemodels/base.py @@ -347,6 +347,7 @@ class ParticipatePage2(PrimaryPage): class Styleguide(PrimaryPage): template = 'wagtailpages/static/styleguide.html' + class HomepageSpotlightPosts(TranslatableMixin, WagtailOrderable): page = ParentalKey( 'wagtailpages.Homepage', @@ -453,7 +454,7 @@ class Meta(TranslatableMixin.Meta): def __str__(self): return self.page.title + '->' + self.highlight.title -# from wagtail.core.models import BootstrapTranslatableModel + class CTA4(TranslatableMixin, CTABase): page = ParentalKey( 'wagtailpages.ParticipatePage2', @@ -492,11 +493,14 @@ class ParticipateHighlights(ParticipateHighlightsBase): class Meta(TranslatableMixin.Meta): pass + + class ParticipateHighlights2(ParticipateHighlightsBase): page = ParentalKey( 'wagtailpages.ParticipatePage2', related_name='featured_highlights2', ) + class Meta(TranslatableMixin.Meta): pass diff --git a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py index d36f248e106..41a3938313f 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py +++ b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py @@ -3,7 +3,7 @@ from django.db import models from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, StreamFieldPanel -from wagtail.core.models import TranslatableMixin, TranslatableMixin, Page +from wagtail.core.models import TranslatableMixin, Page from wagtail.core.fields import RichTextField from wagtail.snippets.edit_handlers import SnippetChooserPanel from wagtail.snippets.models import register_snippet diff --git a/network-api/networkapi/wagtailpages/tests.py b/network-api/networkapi/wagtailpages/tests.py index dd50bbc1eb9..f00a023994f 100644 --- a/network-api/networkapi/wagtailpages/tests.py +++ b/network-api/networkapi/wagtailpages/tests.py @@ -239,7 +239,7 @@ def test_buyersguide_product_redirect_route(self): self.assertEqual(response.redirect_chain[0][0], product.url) def test_sitemap_entries(self): - response = self.client.get('/sitemap.xml') + response = self.client.get('/en/sitemap.xml') context = response.context self.assertEqual(context.template_name, 'sitemap.xml')