Author: rgielen
Date: Thu May 3 07:24:09 2007
New Revision: 534886
URL: http://svn.apache.org/viewvc?view=rev&rev=534886
Log:
WW-1758:
"disabled" attribute was not rendered for <s:submit> tag - modified template,
added tests
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl?view=diff&rev=534886&r1=534885&r2=534886
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl Thu
May 3 07:24:09 2007
@@ -9,6 +9,9 @@
<#if parameters.nameValue?exists>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
+<#if parameters.disabled?default(false)>
+ disabled="disabled"<#rt/>
+</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
</#if>
@@ -39,6 +42,9 @@
</#if>
<#if parameters.nameValue?exists>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
+</#if>
+<#if parameters.disabled?default(false)>
+ disabled="disabled"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java?view=diff&rev=534886&r1=534885&r2=534886
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
Thu May 3 07:24:09 2007
@@ -20,15 +20,11 @@
*/
package org.apache.struts2.views.jsp.ui;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.jsp.tagext.BodyContent;
-
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import com.mockobjects.servlet.MockBodyContent;
+import java.util.HashMap;
+import java.util.Map;
/**
@@ -63,6 +59,7 @@
tag.setAlign("left");
tag.setName("myname");
tag.setValue("%{foo}");
+ tag.setDisabled("true");
tag.doStartTag();
tag.doEndTag();
@@ -79,13 +76,14 @@
tag.setType("button");
tag.setName("myname");
tag.setValue("%{foo}");
+ tag.setDisabled("true");
tag.doStartTag();
tag.doEndTag();
verify(TextFieldTag.class.getResource("Submit-3.txt"));
}
-
+
public void testButtonSimpleWithBody() throws Exception {
TestAction testAction = (TestAction) action;
testAction.setFoo("bar");
@@ -132,6 +130,7 @@
tag.setType("image");
tag.setName("myname");
tag.setValue("%{foo}");
+ tag.setDisabled("true");
tag.doStartTag();
tag.doEndTag();
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt?view=diff&rev=534886&r1=534885&r2=534886
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
Thu May 3 07:24:09 2007
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="left"><input type="submit" id="myname"
name="myname" value="bar"/></div></td>
+ <td colspan="2"><div align="left"><input type="submit" id="myname"
name="myname" value="bar" disabled="disabled"/></div></td>
</tr>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt?view=diff&rev=534886&r1=534885&r2=534886
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
Thu May 3 07:24:09 2007
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><button type="submit" id="myname"
name="myname" value="bar">bar</button></div></td>
+ <td colspan="2"><div align="right"><button type="submit" id="myname"
name="myname" value="bar" disabled="disabled">bar</button></div></td>
</tr>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt?view=diff&rev=534886&r1=534885&r2=534886
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
Thu May 3 07:24:09 2007
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><input type="image" alt="bar"
id="myname" name="myname" value="bar"/></div></td>
+ <td colspan="2"><div align="right"><input type="image" alt="bar"
id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
</tr>
