Author: hermanns
Date: Wed Sep 13 02:58:27 2006
New Revision: 442921
URL: http://svn.apache.org/viewvc?view=rev&rev=442921
Log:
radiomap.ftl formats long numbers with commas
o backport from WW 2.2.3
Issue Number: WW-1437
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?view=diff&rev=442921&r1=442920&r2=442921
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Wed Sep 13 02:58:27 2006
@@ -1,20 +1,21 @@
<@s.iterator value="parameters.list">
<#if parameters.listKey?exists>
- <#assign itemKey = stack.findString(parameters.listKey)/>
+ <#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
- <#assign itemKey = stack.findString('top')/>
+ <#assign itemKey = stack.findValue('top')/>
</#if>
+ <#assign itemKeyStr = itemKey.toString() />
<#if parameters.listValue?exists>
<#assign itemValue = stack.findString(parameters.listValue)/>
<#else>
<#assign itemValue = stack.findString('top')/>
</#if>
-<input type="radio" name="${parameters.name?html}"
id="${parameters.id?html}${itemKey?html}"<#rt/>
+<input type="radio" name="${parameters.name?html}"
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
<#if tag.contains(parameters.nameValue, itemKey)>
checked="checked"<#rt/>
</#if>
<#if itemKey?exists>
- value="${itemKey?html}"<#rt/>
+ value="${itemKeyStr?html}"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
@@ -34,7 +35,7 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/><#rt/>
-<label for="${parameters.id?html}${itemKey?html}"><#rt/>
+<label for="${parameters.id?html}${itemKeyStr?html}"><#rt/>
${itemValue}<#t/>
</label>
</@s.iterator>
