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 2018/11/02 12:25:35 UTC
[sling-org-apache-sling-app-cms] branch master updated: Fixed
SLING-8067 -- fixed the issue where the layout selection was not re-loading
successfully
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 3b6b12e Fixed SLING-8067 -- fixed the issue where the layout selection was not re-loading successfully
new 62b34b3 Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-app-cms.git
3b6b12e is described below
commit 3b6b12ed2c460c80170faccf97dda7c3aa30df9c
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Nov 2 08:24:56 2018 -0400
Fixed SLING-8067 -- fixed the issue where the layout selection was not
re-loading successfully
---
.../apps/reference/components/general/columncontrol/options.jsp | 6 +++---
.../apps/reference/components/general/stylewrapper/options.jsp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/options.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/options.jsp
index c84e56b..53b08bb 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/options.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/options.jsp
@@ -20,7 +20,7 @@
<sling:adaptTo var="pageMgr" adaptable="${slingRequest.requestPathInfo.suffixResource}" adaptTo="org.apache.sling.cms.PageManager" />
<c:set var="configRsrc" value="${pageMgr.page.template.componentConfigs['reference/components/general/columncontrol']}" />
<c:forEach var="layout" items="${configRsrc.valueMap.columns}">
- <option ${slingRequest.requestPathInfo.suffixResource.valueMap.layout == sling:encode(fn:split(layout,'=')[1],'HTML_ATTR') ? 'selected' : ''} value="${sling:encode(fn:split(layout,'=')[1],'HTML_ATTR')}">
- ${sling:encode(fn:split(layout,'=')[0],'HTML')}
- </option>
+ <option ${slingRequest.requestPathInfo.suffixResource.valueMap.layout == fn:split(layout,'=')[1] ? 'selected' : ''} value="${sling:encode(fn:split(layout,'=')[1],'HTML_ATTR')}">
+ ${sling:encode(fn:split(layout,'=')[0],'HTML')}
+ </option>
</c:forEach>
\ No newline at end of file
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/stylewrapper/options.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/general/stylewrapper/options.jsp
index 3477f74..0fe314e 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/stylewrapper/options.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/stylewrapper/options.jsp
@@ -20,7 +20,7 @@
<sling:adaptTo var="pageMgr" adaptable="${slingRequest.requestPathInfo.suffixResource}" adaptTo="org.apache.sling.cms.PageManager" />
<c:set var="configRsrc" value="${pageMgr.page.template.componentConfigs['reference/components/general/stylewrapper']}" />
<c:forEach var="style" items="${configRsrc.valueMap.styles}">
- <option ${slingRequest.requestPathInfo.suffixResource.valueMap.style == sling:encode(fn:split(style,'=')[1],'HTML_ATTR') ? 'selected' : ''} value="${sling:encode(fn:split(style,'=')[1],'HTML_ATTR')}">
- ${sling:encode(fn:split(style,'=')[0],'HTML')}
- </option>
+ <option ${slingRequest.requestPathInfo.suffixResource.valueMap.style == fn:split(style,'=')[1] ? 'selected' : ''} value="${sling:encode(fn:split(style,'=')[1],'HTML_ATTR')}">
+ ${sling:encode(fn:split(style,'=')[0],'HTML')}
+ </option>
</c:forEach>
\ No newline at end of file