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 6c011e2b SLING-11810  - Component Escaping Issues (#34)
6c011e2b is described below

commit 6c011e2b2bbd3b38a434ed812b25298d11c9a484
Author: Dan Klco <[email protected]>
AuthorDate: Thu Mar 23 22:01:18 2023 -0400

    SLING-11810  - Component Escaping Issues (#34)
    
    * SLING-11810 - Fixing missing label name for textfield
    
    * SLING-11810 - Fixing missing row class
---
 .../apps/reference/components/forms/fields/textfield/textfield.jsp    | 2 +-
 .../apps/reference/components/general/columncontrol/columncontrol.jsp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/fields/textfield/textfield.jsp
 
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/fields/textfield/textfield.jsp
index 26c2aac5..f37ec8d4 100644
--- 
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/fields/textfield/textfield.jsp
+++ 
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/fields/textfield/textfield.jsp
@@ -19,7 +19,7 @@
  <%@include file="/libs/sling-cms/global.jsp"%>
 <div class="${sling:encode(formConfig.fieldGroupClass,'HTML_ATTR')} 
${sling:encode(properties.addClasses,'HTML_ATTR')}">
     <c:if test="${not empty properties.label}">
-        <label for="${sling:encode(properties.addClasses,'HTML_ATTR')}">
+        <label for="${sling:encode(properties.name,'HTML_ATTR')}">
             <sling:encode value="${properties.label}" mode="HTML" />
             <c:if test="${properties.required}">
                 <span 
class="${sling:encode(formConfig.fieldRequiredClass,'HTML_ATTR')}">
diff --git 
a/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
 
b/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
index de2bedca..a8ad5cb7 100644
--- 
a/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
+++ 
b/reference/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
@@ -22,7 +22,7 @@
 <c:choose>
     <c:when test="${properties.container == true}">
         <div 
class="${sling:encode(configRsrc.valueMap.containerclass,'HTML_ATTR')}">
-            <div class="${configRsrc.valueMap.rowClass}">
+            <div 
class="${sling:encode(configRsrc.valueMap.rowClass,'HTML_ATTR')}">
                 <c:forEach var="col" 
items="${fn:split(properties.layout,',')}" varStatus="status">
                     <div class="${sling:encode(col,'HTML_ATTR')}">
                         <sling:include path="col-${status.index}" 
resourceType="sling-cms/components/general/container" />
@@ -32,7 +32,7 @@
          </div>
      </c:when>
      <c:otherwise>
-         <div 
class="${sling:encode(configRsrc.valueMap.containerclass,'HTML_ATTR')}">
+         <div 
class="${sling:encode(configRsrc.valueMap.rowClass,'HTML_ATTR')}">
             <c:forEach var="col" items="${fn:split(properties.layout,',')}" 
varStatus="status">
                 <div class="${sling:encode(col,'HTML_ATTR')}">
                     <sling:include path="col-${status.index}" 
resourceType="sling-cms/components/general/container" />

Reply via email to