Author: jholmes
Date: Thu Jul 19 11:57:37 2007
New Revision: 557736
URL: http://svn.apache.org/viewvc?view=rev&rev=557736
Log:
Fix test failures caused by the fix for WW-1887. FreeMarker was complaining
about the toString() call when it was applied to the value created by this tag:
<#assign itemKey = ''/>.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557736&r1=557735&r2=557736
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Thu Jul 19 11:57:37 2007
@@ -42,11 +42,14 @@
<#if parameters.listKey?exists>
<#if stack.findValue(parameters.listKey)?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
+ <#assign itemKeyStr = itemKey.toString()/>
<#else>
<#assign itemKey = ''/>
+ <#assign itemKeyStr = ''/>
</#if>
<#else>
<#assign itemKey = stack.findValue('top')/>
+ <#assign itemKeyStr = itemKey.toString()/>
</#if>
<#if parameters.listValue?exists>
<#if stack.findString(parameters.listValue)?exists>
@@ -57,7 +60,6 @@
<#else>
<#assign itemValue = stack.findString('top')/>
</#if>
- <#assign itemKeyStr = itemKey.toString()/>
<option value="${itemKeyStr?html}"<#rt/>
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
