Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AEA4B192CF for ; Fri, 4 Mar 2016 18:47:42 +0000 (UTC) Received: (qmail 78048 invoked by uid 500); 4 Mar 2016 18:47:42 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 78006 invoked by uid 500); 4 Mar 2016 18:47:42 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 77991 invoked by uid 99); 4 Mar 2016 18:47:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2016 18:47:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 234AEDFC3D; Fri, 4 Mar 2016 18:47:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amashchenko@apache.org To: commits@struts.apache.org Date: Fri, 04 Mar 2016 18:47:42 -0000 Message-Id: <471ccff49aed4a06a1e552a7c91f7ed7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] struts git commit: WW-4586 Custom StrutsTypeConverter's convertToString not called in radio and checkboxlist tags 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 Authored: Fri Mar 4 20:37:51 2016 +0200 Committer: Aleksandr Mashchenko 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 parameters.listLabelKey??> <#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale @@ -59,7 +61,6 @@ <#assign itemTitle = ''/> - <#assign itemKeyStr=itemKey.toString() /> <#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')> - <#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 -->