- Revision
- 176
- Author
- steppat
- Date
- 2007-06-20 17:30:55 -0500 (Wed, 20 Jun 2007)
Log Message
Bug http://jira.codehaus.org/browse/WAFFLE-13 fixed, dateTimePicker tag creates automatically an i18n label when using in form
Modified Paths
Diff
Modified: trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTimePickerTag.java (175 => 176)
--- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTimePickerTag.java 2007-06-20 18:38:25 UTC (rev 175) +++ trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTimePickerTag.java 2007-06-20 22:30:55 UTC (rev 176) @@ -16,7 +16,7 @@ * @author Guilherme Silveira * @since upcoming */ -public class DateTimePickerTag extends TextTag { +public class DateTimePickerTag extends FormElement { private static final String NEW_LINE = System.getProperty("line.separator"); @@ -30,7 +30,7 @@ private String pattern; private Date value; - + @Override public void release() { super.release(); @@ -80,11 +80,8 @@ if (id == null) { id = this.name + "_id"; } - String language = pageContext.getRequest().getLocale().getLanguage(); - // _javascript_ IMPORTS - out.write("<input type=\""); - out.write(this.getType()); + out.write("<input type=\"text"); out.write("\" name=\""); out.write(this.name); out.write("\" id=\""); @@ -143,4 +140,9 @@ private String getFormattedDate() throws JspException { return new SimpleDateFormat(this.pattern).format(this.value); } + + @Override + protected String getDefaultLabel() { + return this.name; + } }
Modified: trunk/extensions/taglib/src/main/resources/META-INF/waffle.tld (175 => 176)
--- trunk/extensions/taglib/src/main/resources/META-INF/waffle.tld 2007-06-20 18:38:25 UTC (rev 175) +++ trunk/extensions/taglib/src/main/resources/META-INF/waffle.tld 2007-06-20 22:30:55 UTC (rev 176) @@ -71,6 +71,11 @@ <bodycontent>empty</bodycontent> <dynamic-attributes>true</dynamic-attributes> <attribute> + <name>label</name> + <type>java.lang.String</type> + <description>This fields label. The default value is the i18n name attribute.</description> + </attribute> + <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue>
Modified: trunk/extensions/taglib-acceptance/src/main/webapp/dateTimePicker.jsp (175 => 176)
--- trunk/extensions/taglib-acceptance/src/main/webapp/dateTimePicker.jsp 2007-06-20 18:38:25 UTC (rev 175) +++ trunk/extensions/taglib-acceptance/src/main/webapp/dateTimePicker.jsp 2007-06-20 22:30:55 UTC (rev 176) @@ -26,10 +26,16 @@ <w:dateTimePicker name="birthday" value="${birthDay}" pattern="dd/MM/yyyy" /> </div> +<w:form id="meu_form" type="table" action="" > <div id="dateTimePickerTest2"> <w:dateTimePicker name="register" value="${register}" pattern="yyyy-MM-dd" /> </div> +<div id="dateTimePickerTest3"> +<w:dateTimePicker label="testLabel" name="register" value="${register}" pattern="dd.MM.yyyy" /> +</div> + +</w:form> </body > </html>
Modified: trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp (175 => 176)
--- trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp 2007-06-20 18:38:25 UTC (rev 175) +++ trunk/extensions/taglib-acceptance/src/main/webapp/index.jsp 2007-06-20 22:30:55 UTC (rev 176) @@ -5,6 +5,7 @@ <body > <a href="" /> +<a href="" /> <a href="" /> <a href="" /> <a href="" />
To unsubscribe from this list please visit:
