Author: lukaszlenart
Date: Mon Dec 30 07:03:55 2013
New Revision: 1554158
URL: http://svn.apache.org/r1554158
Log:
WW-4265 Allows dynamic attributes in checkboxlist tag
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java?rev=1554158&r1=1554157&r2=1554158&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
Mon Dec 30 07:03:55 2013
@@ -44,7 +44,11 @@ import com.opensymphony.xwork2.util.Valu
* </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";
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=1554158&r1=1554157&r2=1554158&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
Mon Dec 30 07:03:55 2013
@@ -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>
Modified: struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html?rev=1554158&r1=1554157&r2=1554158&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html Mon Dec
30 07:03:55 2013
@@ -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"> </td>
