From de6bd7ac34a97b94a5c62b133033b601da18b29d Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 14 Sep 2021 16:30:04 -0400 Subject: [PATCH 1/3] #643 - Site title shows up the component policy title if not authored on header component policy --- CHANGELOG.md | 4 ++++ .../assetshare/components/structure/Header.java | 2 +- .../components/structure/impl/HeaderImpl.java | 8 +++++++- .../components/structure/package-info.java | 2 +- .../structure/header/_cq_design_dialog/.content.xml | 9 +++++++++ .../structure/header/_cq_dialog/.content.xml | 12 +++++++++++- 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b44a7c9c0..01a6bef53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +- 0643 - Site title shows up the component policy title if not authored on header component policy + ## [v2.1.4] ### Fixed diff --git a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/Header.java b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/Header.java index 7217f46db..bfca43121 100644 --- a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/Header.java +++ b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/Header.java @@ -42,7 +42,7 @@ public interface Header extends Component { /** * property in which a site title is stored. */ - String PN_SITE_TITLE = JcrConstants.JCR_TITLE; + String PN_SITE_TITLE = "title"; /** * Name of the node relative to the header component that stores the pages and icon items. diff --git a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/impl/HeaderImpl.java b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/impl/HeaderImpl.java index 8bde58c3d..4f6e02d37 100644 --- a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/impl/HeaderImpl.java +++ b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/impl/HeaderImpl.java @@ -22,10 +22,11 @@ import com.adobe.aem.commons.assetshare.components.structure.Header; import com.adobe.cq.export.json.ComponentExporter; import com.adobe.cq.export.json.ExporterConstants; +import com.day.cq.commons.jcr.JcrConstants; import com.day.cq.wcm.api.Page; import com.day.cq.wcm.api.PageManager; import com.day.cq.wcm.api.designer.Style; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; @@ -200,6 +201,11 @@ public String getSiteTitle() { siteTitle = getHeaderProperty(PN_SITE_TITLE); } + // Check old property name for backwards compatibility + if (siteTitle == null) { + siteTitle = getHeaderProperty(JcrConstants.JCR_TITLE); + } + return siteTitle; } diff --git a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/package-info.java b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/package-info.java index b642a9fd6..19e04061c 100644 --- a/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/package-info.java +++ b/core/src/main/java/com/adobe/aem/commons/assetshare/components/structure/package-info.java @@ -17,7 +17,7 @@ * */ -@Version("2.0.1") +@Version("2.0.2") package com.adobe.aem.commons.assetshare.components.structure; import org.osgi.annotation.versioning.Version; diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml index 5e845d644..ea4a6b491 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml @@ -53,6 +53,15 @@ jcr:primaryType="nt:unstructured" sling:resourceType="granite/ui/components/coral/foundation/form/textfield" fieldLabel="Site Title" + name="./title"/> + + diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml index e11057358..3395d559e 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml @@ -57,7 +57,8 @@ jcr:primaryType="nt:unstructured" sling:resourceType="granite/ui/components/coral/foundation/form/textfield" fieldLabel="Site Title" - name="./jcr:title"/> + name="./title"/> + + + From f0ae40ffabddc96cb69645312b12f513fff6602d Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 14 Sep 2021 16:37:17 -0400 Subject: [PATCH 2/3] #643 - allow legacy fields to be writeable so they can be cleared if needed --- .../components/structure/header/_cq_design_dialog/.content.xml | 2 +- .../components/structure/header/_cq_dialog/.content.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml index ea4a6b491..b533566f2 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml @@ -61,7 +61,7 @@ fieldDescription="Please use the Site Title field defined above." fieldLabel="Site Title (Legacy field)" emptyText="Please use the Site Title field above." - disabled="{Boolean}true" + disabled="{Boolean}false" name="./jcr:title"/> diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml index 3395d559e..8989b5e6b 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml @@ -73,7 +73,7 @@ fieldDescription="Please use the Site Title field defined above." fieldLabel="Site Title (Legacy field)" emptyText="Please use the Site Title field above." - disabled="{Boolean}true" + disabled="{Boolean}false" name="./jcr:title"/> From 768a845822bc8244f57632bcc99231428bf7f322 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 14 Sep 2021 16:39:18 -0400 Subject: [PATCH 3/3] verbiage --- .../structure/header/_cq_design_dialog/.content.xml | 4 ++-- .../components/structure/header/_cq_dialog/.content.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml index b533566f2..9fc2adfba 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_design_dialog/.content.xml @@ -58,9 +58,9 @@ diff --git a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml index 8989b5e6b..96dcb8e13 100644 --- a/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml +++ b/ui.apps/src/main/content/jcr_root/apps/asset-share-commons/components/structure/header/_cq_dialog/.content.xml @@ -70,9 +70,9 @@