Author: mrdon
Date: Fri Jan 25 03:45:27 2008
New Revision: 615188
URL: http://svn.apache.org/viewvc?rev=615188&view=rev
Log:
Enabled the "disabled" attribute for datetimepicker
WW-2320
Added:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java?rev=615188&r1=615187&r2=615188&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
Fri Jan 25 03:45:27 2008
@@ -218,6 +218,10 @@
addParameter("displayWeeks", findString(displayWeeks));
if(adjustWeeks != null)
addParameter("adjustWeeks", findValue(adjustWeeks, Boolean.class));
+
+ if(disabled != null)
+ addParameter("disabled", findValue(disabled, Boolean.class));
+
if(startDate != null)
addParameter("startDate", format(findValue(startDate)));
if(endDate != null)
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java?rev=615188&r1=615187&r2=615188&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
Fri Jan 25 03:45:27 2008
@@ -78,6 +78,7 @@
dateTimePicker.setType(type);
dateTimePicker.setTemplateCssPath(templateCssPath);
dateTimePicker.setValueNotifyTopics(valueNotifyTopics);
+ dateTimePicker.setDisabled(disabled);
}
public void setAdjustWeeks(String adjustWeeks) {
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl?rev=615188&r1=615187&r2=615188&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
Fri Jan 25 03:45:27 2008
@@ -91,6 +91,9 @@
<#if parameters.valueNotifyTopics?if_exists != "">
valueNotifyTopics="${parameters.valueNotifyTopics?html}"<#rt/>
</#if>
+ <#if parameters.disabled?exists>
+ disabled="${parameters.disabled?string?html}"<#rt/>
+ </#if>
saveFormat="rfc"<#rt/>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
></div>
Modified:
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java?rev=615188&r1=615187&r2=615188&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
Fri Jan 25 03:45:27 2008
@@ -154,9 +154,6 @@
* #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag,
String, String[])} as properties to
* verify.<p/> This implementation defines testdata for all common
AbstractUITag properties and may be overridden in
* subclasses.
- *
- * @return A Map of PropertyHolders values bound to [EMAIL PROTECTED]
org.apache.struts2.views.jsp.ui.AbstractUITagTest.PropertyHolder#getName()}
- * as key.
*/
protected Map initializedGenericTagTestProperties() {
Map result = new HashMap();
Modified:
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java?rev=615188&r1=615187&r2=615188&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
Fri Jan 25 03:45:27 2008
@@ -58,6 +58,32 @@
.getResource("DateTimePickerTagTest-1.txt"));
}
+ public void testSimpleDisabled() throws Exception {
+ DateTimePickerTag tag = new DateTimePickerTag();
+ tag.setPageContext(pageContext);
+
+ tag.setId("id");
+
+ tag.setAdjustWeeks("true");
+ tag.setDayWidth("b");
+ tag.setDisplayWeeks("true");
+ tag.setEndDate("%{'2008-01-01'}");
+ tag.setStartDate("%{'2008-02-02'}");
+ tag.setStaticDisplay("false");
+ tag.setWeekStartsOn("g");
+ tag.setName("h");
+ tag.setLanguage("i");
+ tag.setTemplateCssPath("j");
+ tag.setValueNotifyTopics("k");
+ tag.setValue("%{'2008-03-03'}");
+ tag.setDisabled("true");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(DateTimePickerTagTest.class
+ .getResource("DateTimePickerTagTest-2.txt"));
+ }
+
public void testTodayValue() throws Exception {
DateTimePickerTag tag = new DateTimePickerTag();
tag.setPageContext(pageContext);
Added:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt?rev=615188&view=auto
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
(added)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
Fri Jan 25 03:45:27 2008
@@ -0,0 +1,19 @@
+<div dojoType="struts:StrutsDatePicker"
+ id="id"
+ value="2008-03-03"
+ lang="i"
+ name="h"
+ inputName="dojo.h"
+ displayWeeks="true"
+ adjustWeeks="true"
+ startDate="2008-02-02"
+ endDate="2008-01-01"
+ weekStartsOn="g"
+ staticDisplay="false"
+ templateCssPath="j"
+ valueNotifyTopics="k"
+ disabled="true"
+ saveFormat="rfc">
+</div>
+<script language="JavaScript"
type="text/javascript">djConfig.searchIds.push("id");</script>
+
