From 22ff1d215606c33a462689e82fe2019a87ad2e0a Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 18 Oct 2021 11:54:35 +0100 Subject: [PATCH 1/3] [7571] On the BanneredCampaignPage, only show root page title if the menu is shown too --- .../templates/wagtailpages/fragments/primary_heroguts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html index 97f26956032..c24009987fe 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html @@ -46,7 +46,7 @@

{{ page.hero_headline }}

-

{% if root.title %}{{ root.title }}{% elif page.header %}{{ page.header }}{% else %}{{ page.title }}{% endif %}

+

{% if uses_menu and root.title %}{{ root.title }}{% elif page.header %}{{ page.header }}{% else %}{{ page.title }}{% endif %}

{% if page.intro %}

{{ page.intro }}

{% endif %} From 35e4e4cc46d40ac5295d86c1ac78c784ece70bdb Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 19 Oct 2021 15:18:49 +0100 Subject: [PATCH 2/3] [7336] remove redundant function call and header output in template --- network-api/networkapi/wagtailpages/pagemodels/campaigns.py | 2 +- .../templates/wagtailpages/fragments/primary_heroguts.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py index 75555ee3ad5..12c8017c8f1 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py +++ b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py @@ -347,7 +347,7 @@ class BanneredCampaignPage(PrimaryPage): def get_context(self, request): context = super().get_context(request) context['related_posts'] = get_content_related_by_tag(self) - return get_page_tree_information(self, context) + return context class Meta: verbose_name = "Banner Page" diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html index c24009987fe..f9fa5af8aa5 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/primary_heroguts.html @@ -46,7 +46,7 @@

{{ page.hero_headline }}

-

{% if uses_menu and root.title %}{{ root.title }}{% elif page.header %}{{ page.header }}{% else %}{{ page.title }}{% endif %}

+

{% if uses_menu and root.title %}{{ root.title }}{% else %}{{ page.title }}{% endif %}

{% if page.intro %}

{{ page.intro }}

{% endif %} From 14b86a32eab1a9e21e483fecc16c5269a562b047 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 19 Oct 2021 15:27:01 +0100 Subject: [PATCH 3/3] [7336] code formar --- network-api/networkapi/wagtailpages/pagemodels/campaigns.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py index 12c8017c8f1..3bff78a1b2f 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py +++ b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py @@ -17,10 +17,7 @@ from .modular import MiniSiteNameSpace from .primary import PrimaryPage from .mixin.foundation_metadata import FoundationMetadataPageMixin -from ..utils import ( - get_page_tree_information, - get_content_related_by_tag -) +from ..utils import get_content_related_by_tag class CTA(models.Model):