You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2016/03/04 19:44:35 UTC
[1/3] struts git commit: WW-4586 Custom StrutsTypeConverter's
convertToString not called in radio and checkboxlist tags
Repository: struts
Updated Branches:
refs/heads/master 2b92ebb50 -> 866b8902c
WW-4586 Custom StrutsTypeConverter's convertToString not called in radio and checkboxlist tags
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7a0ae0eb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7a0ae0eb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7a0ae0eb
Branch: refs/heads/master
Commit: 7a0ae0ebae8fe4deddc93bbfb4a76dbe09cefc77
Parents: 2b92ebb
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Fri Mar 4 20:37:51 2016 +0200
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Fri Mar 4 20:37:51 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/7a0ae0eb/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 4f262ec..aac9ca1 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/7a0ae0eb/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 80b8815..61950e9 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 -->
[3/3] struts git commit: radio checked fix
Posted by am...@apache.org.
radio checked fix
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/866b8902
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/866b8902
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/866b8902
Branch: refs/heads/master
Commit: 866b8902cd62dfdc9245b6dbb76e0f4fff818b4d
Parents: 820c52d
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Fri Mar 4 20:43:07 2016 +0200
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Fri Mar 4 20:43:07 2016 +0200
----------------------------------------------------------------------
core/src/main/resources/template/simple/radiomap.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/866b8902/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 61950e9..9c846e5 100644
--- a/core/src/main/resources/template/simple/radiomap.ftl
+++ b/core/src/main/resources/template/simple/radiomap.ftl
@@ -65,7 +65,7 @@
name="${parameters.name?html}"<#rt/>
</#if>
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
-<#if tag.contains(parameters.nameValue!'', itemKeyStr)>
+<#if tag.contains(parameters.nameValue, itemKey)>
checked="checked"<#rt/>
</#if>
<#if itemKey??>
[2/3] struts git commit: formatting
Posted by am...@apache.org.
formatting
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/820c52dd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/820c52dd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/820c52dd
Branch: refs/heads/master
Commit: 820c52dd2689add4e59f3459c01a52bdd391e712
Parents: 7a0ae0e
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Fri Mar 4 20:39:58 2016 +0200
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Fri Mar 4 20:39:58 2016 +0200
----------------------------------------------------------------------
core/src/main/resources/template/simple/checkboxlist.ftl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/820c52dd/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 aac9ca1..c90e024 100644
--- a/core/src/main/resources/template/simple/checkboxlist.ftl
+++ b/core/src/main/resources/template/simple/checkboxlist.ftl
@@ -27,9 +27,9 @@
<#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')>
+ <#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