mirror of
https://github.com/apache/struts.git
synced 2026-08-11 09:36:57 +00:00
WW-4586 Custom StrutsTypeConverter's convertToString not called in radio and checkboxlist tags
This commit is contained in:
@@ -26,8 +26,10 @@
|
||||
<#assign itemCount = itemCount + 1/>
|
||||
<#if parameters.listKey??>
|
||||
<#assign itemKey = stack.findValue(parameters.listKey)/>
|
||||
<#assign itemKeyStr = stack.findString(parameters.listKey)/>
|
||||
<#else>
|
||||
<#assign itemKey = stack.findValue('top')/>
|
||||
<#assign itemKeyStr = stack.findString('top')>
|
||||
</#if>
|
||||
<#if parameters.listLabelKey??>
|
||||
<#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale
|
||||
@@ -59,7 +61,6 @@
|
||||
<#assign itemTitle = ''/>
|
||||
</#if>
|
||||
</#if>
|
||||
<#assign itemKeyStr=itemKey.toString() />
|
||||
<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}"<#rt/>
|
||||
<#if parameters.id?has_content>
|
||||
id="${parameters.id?html}-${itemCount}"<#rt/>
|
||||
|
||||
@@ -23,10 +23,11 @@
|
||||
<@s.iterator value="parameters.list">
|
||||
<#if parameters.listKey??>
|
||||
<#assign itemKey = stack.findValue(parameters.listKey)/>
|
||||
<#assign itemKeyStr = stack.findString(parameters.listKey)/>
|
||||
<#else>
|
||||
<#assign itemKey = stack.findValue('top')/>
|
||||
<#assign itemKeyStr = stack.findString('top')>
|
||||
</#if>
|
||||
<#assign itemKeyStr = itemKey.toString() />
|
||||
<#if parameters.listValueKey??>
|
||||
<#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale
|
||||
file for it's localized value. This is then used as a label -->
|
||||
|
||||
Reference in New Issue
Block a user