- Revision
- 291
- Author
- gas
- Date
- 2007-07-27 11:57:30 -0500 (Fri, 27 Jul 2007)
Log Message
fixing bug where select tag content cannot be null
Modified Paths
- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/BasicSelectTag.java
- trunk/extensions/taglib-acceptance/src/main/webapp/select.jsp
- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/SelectTest.java
Diff
Modified: trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/BasicSelectTag.java (290 => 291)
--- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/BasicSelectTag.java 2007-07-27 02:16:14 UTC (rev 290) +++ trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/BasicSelectTag.java 2007-07-27 16:57:30 UTC (rev 291) @@ -63,7 +63,7 @@ @Override protected IterationResult afterBody(JspWriter out) throws IOException { - return iterator.hasNext() ? IterationResult.BODY_AGAIN : IterationResult.PAGE; + return (iterator != null && iterator.hasNext()) ? IterationResult.BODY_AGAIN : IterationResult.PAGE; } @Override
Modified: trunk/extensions/taglib-acceptance/src/main/webapp/select.jsp (290 => 291)
--- trunk/extensions/taglib-acceptance/src/main/webapp/select.jsp 2007-07-27 02:16:14 UTC (rev 290) +++ trunk/extensions/taglib-acceptance/src/main/webapp/select.jsp 2007-07-27 16:57:30 UTC (rev 291) @@ -26,34 +26,40 @@ <w:select id="rendered" rendered="${true}" var="produto" name="rendered" items="${lista}" value="id">${produto.name}</w:select> </div> -test selected=2 <br> +test selected=2 <br /> <w:select var="produto" name="produto.id.selected.2" items="${lista}" value="id" selected="${2}"> ${produto.name} </w:select> -<br> -<br> +<br /> +<br /> -test selected=null <br> +test selected=null <br /> <w:select var="produto" name="produto.id.selected.null" items="${lista}" value="id" selected="${null}"> ${produto.name} </w:select> -<br> -<br> +<br /> +<br /> -w:select type="combo": <br> +w:select type="combo": <br /> <w:select var="produto" name="produto.id" items="${lista}" value="id" selected="${2}" addEmpty="true"> ${produto.name} </w:select> -<br> -<br> +<br /> +<br /> -w:select type="radio": <br> +w:select type="radio": <br /> <w:select type="radio" var="produto" name="produto.id" items="${lista}" value="id" > ${produto.name} </w:select> +<br /><br /> +w:select with null list: <br /> +<w:select var="produto" name="nulledList" items="${unknown}" value="id" > + ${produto.name} +</w:select> + </body > </html>
Modified: trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/SelectTest.java (290 => 291)
--- trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/SelectTest.java 2007-07-27 02:16:14 UTC (rev 290) +++ trunk/extensions/taglib-acceptance/src/test/java/org/codehaus/waffle/taglib/acceptance/SelectTest.java 2007-07-27 16:57:30 UTC (rev 291) @@ -20,4 +20,9 @@ assertEquals("", selenium.getSelectedId("produto.id.selected.null")); } + public void testAcceptsNullAsContent() { + open("select.jsp"); + assertEquals(0, selenium.getSelectOptions("nulledList").length); + } + }
To unsubscribe from this list please visit:
