struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgie...@apache.org
Subject svn commit: r632754 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/resources/template/simple/checkboxlist.ftl test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
Date Sun, 02 Mar 2008 13:15:58 GMT
Author: rgielen
Date: Sun Mar  2 05:15:57 2008
New Revision: 632754

URL: http://svn.apache.org/viewvc?rev=632754&view=rev
Log:
WW-2524:
Temporarily disabling patch for a clean 2.0.11.1 fast track security fix release

Modified:
    struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkboxlist.ftl
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
    struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkboxlist.ftl?rev=632754&r1=632753&r2=632754&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkboxlist.ftl
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkboxlist.ftl
Sun Mar  2 05:15:57 2008
@@ -30,7 +30,7 @@
             <#assign itemKey = stack.findValue('top')/>
         </#if>
         <#if parameters.listValue?exists>
-            <#assign itemValue = stack.findString(parameters.listValue)?default("")/>
+            <#assign itemValue = stack.findString(parameters.listValue)/>
         <#else>
             <#assign itemValue = stack.findString('top')/>
         </#if>

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java?rev=632754&r1=632753&r2=632754&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
Sun Mar  2 05:15:57 2008
@@ -140,8 +140,7 @@
         testAction.setFoo("hello");
         testAction.setList(new String[][]{
                 {"hello", "world"},
-                {"foo", "bar"},
-                {"baz", null}
+                {"foo", "bar"}
         });
 
         CheckboxListTag tag = new CheckboxListTag();

Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt?rev=632754&r1=632753&r2=632754&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
(original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
Sun Mar  2 05:15:57 2008
@@ -5,7 +5,5 @@
 <label for="foo-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" title="mytitle" onchange="alert('foo');"/>
 <label for="foo-2" class="checkboxLabel">bar</label>
-<input type="checkbox" name="foo" value="baz" id="foo-3" title="mytitle" onchange="alert('foo');"/>
-<label for="foo-3" class="checkboxLabel"></label>
     </td>
 </tr>



Mime
View raw message