Author: tmjee
Date: Tue Sep 19 09:36:02 2006
New Revision: 447901
URL: http://svn.apache.org/viewvc?view=rev&rev=447901
Log:
WW-1449
Select Component does not preselect header
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
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
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=447901&r1=447900&r2=447901
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Tue
Sep 19 09:36:02 2006
@@ -28,7 +28,11 @@
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
>
<#if parameters.headerKey?exists && parameters.headerValue?exists>
- <option
value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
+ <option value="${parameters.headerKey?html}"
+ <#if tag.contains(parameters.nameValue, parameters.headerKey) == true>
+ selected="selected"
+ </#if>
+ >${parameters.headerValue?html}</option>
</#if>
<#if parameters.emptyOption?default(false)>
<option value=""></option>
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=447901&r1=447900&r2=447901
==============================================================================
---
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
Tue Sep 19 09:36:02 2006
@@ -29,6 +29,23 @@
/**
*/
public class SelectTest extends AbstractUITagTest {
+
+
+ public void testHeaderCanBePreselected() throws Exception {
+ SelectTag tag = new SelectTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("myLabel");
+ tag.setList("#{1:'Cat',2:'Dog'}");
+ tag.setName("myPet");
+ tag.setHeaderKey("-1");
+ tag.setHeaderValue("--- Please Select ---");
+ tag.setValue("%{'-1'}");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-8.txt"));
+ }
/**
* Tests WW-455: Select tag template does not work properly for Object
like BigDecimal.
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt?view=auto&rev=447901
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
(added)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
Tue Sep 19 09:36:02 2006
@@ -0,0 +1,10 @@
+<tr>
+<td class="tdLabel"><label for="myPet" class="label">myLabel:</label></td>
+<td>
+<select name="myPet" id="myPet">
+ <option value="-1" selected="selected">--- Please Select ---</option>
+ <option value="1">Cat</option>
+ <option value="2">Dog</option>
+</select>
+</td>
+</tr>
\ No newline at end of file
