You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/12/19 21:09:57 UTC
[sling-org-apache-sling-app-cms] 10/17: side navigation
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-7900
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 68b45fb419305b2947a3b8f4f47828f183b50729
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Mon Sep 17 11:41:58 2018 -0400
side navigation
---
.../sling/cms/core/models/components/Breadcrumbs.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/components/Breadcrumbs.java b/core/src/main/java/org/apache/sling/cms/core/models/components/Breadcrumbs.java
index d119638..0d2f8fa 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/components/Breadcrumbs.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/components/Breadcrumbs.java
@@ -39,7 +39,7 @@ import org.apache.sling.models.annotations.injectorspecific.Self;
*
*/
@Model(adaptables = SlingHttpServletRequest.class, defaultInjectionStrategy = DefaultInjectionStrategy.OPTIONAL)
-public class Breadcrumbs extends BaseModel {
+public class Breadcrumbs {
@Inject
@Via("resource")
@@ -51,6 +51,10 @@ public class Breadcrumbs extends BaseModel {
@Via("resource")
@Default(values = "jcr:title")
String titleProp;
+
+ @Inject
+ @Self
+ public SlingHttpServletRequest slingRequest;
Resource suffixResource;
@@ -66,7 +70,7 @@ public class Breadcrumbs extends BaseModel {
boolean first = true;
while (suffixResource.getParent() != null) {
String suffix = suffixResource.getPath();
- pathData.add(0, new PathData(suffix, prefix + getTitle(suffixResource), first));
+ pathData.add(0, new PathData(prefix + suffix, getTitle(suffixResource), first));
if (first) {
first = false;
}
@@ -78,11 +82,12 @@ public class Breadcrumbs extends BaseModel {
}
private String getTitle(Resource resource) {
- String title = get("jcr:title", String.class);
+ ValueMap map = resource.getValueMap();
+ String title = map.get("jcr:title", String.class);
if (title != null) {
return title;
}
- title = get("jcr:content/jcr:title", String.class);
+ title = map.get("jcr:content/jcr:title", String.class);
if (title != null) {
return title;
}
@@ -109,8 +114,6 @@ public class Breadcrumbs extends BaseModel {
return href; // prefix + resource path
}
- // ${parent.valueMap['jcr:title'] != null ? parent.valueMap['jcr:title'] :
- // parent.valueMap['jcr:content/jcr:title']}" default="${parent.name}"
public String getTitle() {
return title;
}