struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgie...@apache.org
Subject svn commit: r515872 - in /struts/struts2/branches/STRUTS_2_0_X/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
Date Thu, 08 Mar 2007 01:07:39 GMT
Author: rgielen
Date: Wed Mar  7 17:07:38 2007
New Revision: 515872

URL: http://svn.apache.org/viewvc?view=rev&rev=515872
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/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt

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=515872&r1=515871&r2=515872
==============================================================================
--- 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
Wed Mar  7 17:07:38 2007
@@ -1,3 +1,4 @@
+<#setting number_format="#">
 <select<#rt/>
  name="${parameters.name?default("")?html}"<#rt/>
 <#if parameters.get("size")?exists>

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=515872&r1=515871&r2=515872
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
Wed Mar  7 17:07:38 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/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt?view=diff&rev=515872&r1=515871&r2=515872
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
Wed Mar  7 17:07:38 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>



Mime
View raw message