From b7caa28be071adf4977367f8158d5ac422bfaf1b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 30 Dec 2013 07:03:55 +0000
Subject: [PATCH] WW-4265 Allows dynamic attributes in checkboxlist tag

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554158 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/components/CheckboxList.java    | 6 +++++-
 core/src/main/resources/template/simple/checkboxlist.ftl    | 1 +
 core/src/site/resources/tags/checkboxlist.html              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
index b6cb477f2..6415efb00 100644
--- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java
+++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
@@ -44,7 +44,11 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="checkboxlist", tldTagClass="org.apache.struts2.views.jsp.ui.CheckboxListTag", description="Render a list of checkboxes")
+@StrutsTag(
+        name="checkboxlist",
+        tldTagClass="org.apache.struts2.views.jsp.ui.CheckboxListTag",
+        description="Render a list of checkboxes",
+        allowDynamicAttributes = true)
 public class CheckboxList extends ListUIBean {
     final public static String TEMPLATE = "checkboxlist";
 
diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl
index 6c1f9a722..ba04196b4 100644
--- a/core/src/main/resources/template/simple/checkboxlist.ftl
+++ b/core/src/main/resources/template/simple/checkboxlist.ftl
@@ -88,6 +88,7 @@
     <#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
     <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
     <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
+    <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
         />
 <label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label>
 </@s.iterator>
diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html
index 23dbf7cea..0ad3225c5 100644
--- a/core/src/site/resources/tags/checkboxlist.html
+++ b/core/src/site/resources/tags/checkboxlist.html
@@ -20,7 +20,7 @@ Please do not edit it directly.
 		<!-- START SNIPPET: tagattributes -->
 		<table width="100%">
 			<tr>
-				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> false</td>
+				<td colspan="6"><h4>Dynamic Attributes Allowed:</h4> true</td>
 			</tr>
 			<tr>
 				<td colspan="6">&nbsp;</td>