Author: hermanns Date: Wed Sep 13 02:49:45 2006 New Revision: 442920 URL: http://svn.apache.org/viewvc?view=rev&rev=442920 Log: readonly attribute on ww:textfield does not behave as a boolean o backport from WW 2.2.3 o problem also fixed in other templates
Issue Number: WW-1436 Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/textarea.ftl struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/textarea.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/textarea.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/ajax/textarea.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/ajax/textarea.ftl Wed Sep 13 02:49:45 2006 @@ -16,7 +16,7 @@ <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> readonly="readonly"<#rt/> </#if> <#if parameters.tabindex?exists> Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl Wed Sep 13 02:49:45 2006 @@ -5,7 +5,7 @@ <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> readonly="readonly"<#rt/> </#if> <#if parameters.tabindex?exists> Modified: struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl Wed Sep 13 02:49:45 2006 @@ -17,7 +17,7 @@ <br/> <#if parameters.list?exists> <select onChange="autoPopulate_${parameters.name?html}(this);"<#rt/> - <#if parameters.disabled?exists && parameters.disabled> + <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> > Modified: struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl Wed Sep 13 02:49:45 2006 @@ -3,7 +3,7 @@ dojo.require("struts.widgets.*"); </script> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> <#include "/${parameters.templateDir}/simple/text.ftl" /> <#else> <#-- Modified: struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl Wed Sep 13 02:49:45 2006 @@ -12,7 +12,7 @@ <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> readonly="readonly"<#rt/> </#if> <#if parameters.tabindex?exists> Modified: struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl Wed Sep 13 02:49:45 2006 @@ -8,7 +8,7 @@ <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> readonly="readonly"<#rt/> </#if> <#if parameters.tabindex?exists> Modified: struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl?view=diff&rev=442920&r1=442919&r2=442920 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl Wed Sep 13 02:49:45 2006 @@ -2,7 +2,7 @@ dojo.require("struts.widgets.*"); </script> -<#if parameters.readonly?exists> +<#if parameters.readonly?default(false)> <#include "/${parameters.templateDir}/simple/text.ftl" /> <#else> <div dojoType="dropdowntimepicker"