Repository: struts Updated Branches: refs/heads/support-2-3 c714d2674 -> 5cf4aacd5
WW-4586 Custom StrutsTypeConverter's convertToString not called in radio and checkboxlist tags (cherry picked from commit 7a0ae0ebae8fe4deddc93bbfb4a76dbe09cefc77) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6ac2a58d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6ac2a58d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6ac2a58d Branch: refs/heads/support-2-3 Commit: 6ac2a58da7cb02d5b5af72e06377a46f832c6bb7 Parents: c714d26 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Fri Mar 4 20:37:51 2016 +0200 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Fri Mar 4 20:46:23 2016 +0200 ---------------------------------------------------------------------- core/src/main/resources/template/simple/checkboxlist.ftl | 3 ++- core/src/main/resources/template/simple/radiomap.ftl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6ac2a58d/core/src/main/resources/template/simple/checkboxlist.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl index d50a98f..c3788dc 100644 --- a/core/src/main/resources/template/simple/checkboxlist.ftl +++ b/core/src/main/resources/template/simple/checkboxlist.ftl @@ -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/> http://git-wip-us.apache.org/repos/asf/struts/blob/6ac2a58d/core/src/main/resources/template/simple/radiomap.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/radiomap.ftl b/core/src/main/resources/template/simple/radiomap.ftl index 9160e05..37c3f59 100644 --- a/core/src/main/resources/template/simple/radiomap.ftl +++ b/core/src/main/resources/template/simple/radiomap.ftl @@ -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 -->
