You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2012/05/29 14:44:00 UTC
svn commit: r1343701 - in /struts/struts2/trunk/core/src:
main/resources/template/simple/dynamic-attributes.ftl
test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
Author: lukaszlenart
Date: Tue May 29 12:43:59 2012
New Revision: 1343701
URL: http://svn.apache.org/viewvc?rev=1343701&view=rev
Log:
WW-3828 adds support for dynamic attributes not only for String literals but for other objects
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl?rev=1343701&r1=1343700&r2=1343701&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl Tue May 29 12:43:59 2012
@@ -24,7 +24,11 @@
<#assign aKeys = parameters.dynamicAttributes.keySet()><#rt/>
<#list aKeys as aKey><#rt/>
<#assign keyValue = parameters.dynamicAttributes[aKey]/>
- <#assign value = struts.translateVariables(keyValue)!keyValue/>
+ <#if keyValue?is_string>
+ <#assign value = struts.translateVariables(keyValue)!keyValue/>
+ <#else>
+ <#assign value = keyValue?string/>
+ </#if>
${aKey}="${value?html}"<#rt/>
</#list><#rt/>
</#if><#rt/>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java?rev=1343701&r1=1343700&r2=1343701&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java Tue May 29 12:43:59 2012
@@ -216,7 +216,8 @@ public class FreeMarkerResultTest extend
ActionMapping mapping = dispatcher.getContainer().getInstance(ActionMapper.class).getMapping(request, dispatcher.getConfigurationManager());
dispatcher.serviceAction(request, response, servletContext, mapping);
String expected = "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
- + "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>";
+ + "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" placeholder=\"input\" foo=\"bar\"/>"
+ + "<input type=\"text\" name=\"test\" value=\"\" id=\"test\" break=\"true\"/>";
assertEquals(expected, stringWriter.toString());
}
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl?rev=1343701&r1=1343700&r2=1343701&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl Tue May 29 12:43:59 2012
@@ -21,4 +21,5 @@
*/
-->
<@s.textfield name="test" dynamicAttributes={"placeholder":"input","foo":"bar"}/>
-<@s.textfield name="test" placeholder="input" foo="bar"/>
\ No newline at end of file
+<@s.textfield name="test" placeholder="input" foo="bar"/>
+<@s.textfield name="test" break=true />
\ No newline at end of file