You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by rg...@apache.org on 2007/03/08 02:06:59 UTC
svn commit: r515871 - in /struts/struts2/trunk/core/src:
main/resources/template/simple/select.ftl
test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
Author: rgielen
Date: Wed Mar 7 17:06:58 2007
New Revision: 515871
URL: http://svn.apache.org/viewvc?view=rev&rev=515871
Log:
WW-1747:
- updated test to show number formatting issue pointed out by Mike Baroukh
- fixed issue by preventing freemarker from formatting numbers for this template
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=515871&r1=515870&r2=515871
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Wed Mar 7 17:06:58 2007
@@ -1,3 +1,4 @@
+<#setting number_format="#">
<select<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
<#if parameters.get("size")?exists>
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=515871&r1=515870&r2=515871
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java Wed Mar 7 17:06:58 2007
@@ -275,13 +275,13 @@
Collection collection = new ArrayList(2);
collection.add(1l);
- collection.add(3l);
+ collection.add(300000000l);
testAction.setCollection(collection);
List selectList = new ArrayList();
selectList.add(new LongObject(1l, "foo"));
selectList.add(new LongObject(2l, "bar"));
- selectList.add(new LongObject(3l, "foobar"));
+ selectList.add(new LongObject(300000000l, "foobar"));
testAction.setList2(selectList);
SelectTag tag = new SelectTag();
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt?view=diff&rev=515871&r1=515870&r2=515871
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt Wed Mar 7 17:06:58 2007
@@ -3,6 +3,6 @@
<td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
<option value="1" selected="selected">foo</option>
<option value="2">bar</option>
- <option value="3" selected="selected">foobar</option>
+ <option value="300000000" selected="selected">foobar</option>
</select></td>
</tr>