From 06a424ea7aa0c1b9ea18a588b62c6a1f4e55e6a8 Mon Sep 17 00:00:00 2001
From: Rainer Hermanns <hermanns@apache.org>
Date: Wed, 13 Sep 2006 09:49:45 +0000
Subject: [PATCH] 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

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@442920 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/resources/template/ajax/textarea.ftl     | 2 +-
 core/src/main/resources/template/simple/checkbox.ftl   | 2 +-
 core/src/main/resources/template/simple/combobox.ftl   | 2 +-
 core/src/main/resources/template/simple/datepicker.ftl | 2 +-
 core/src/main/resources/template/simple/password.ftl   | 2 +-
 core/src/main/resources/template/simple/textarea.ftl   | 2 +-
 core/src/main/resources/template/simple/timepicker.ftl | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/resources/template/ajax/textarea.ftl b/core/src/main/resources/template/ajax/textarea.ftl
index 1d9d66e34..c5ea8373f 100644
--- a/core/src/main/resources/template/ajax/textarea.ftl
+++ b/core/src/main/resources/template/ajax/textarea.ftl
@@ -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>
diff --git a/core/src/main/resources/template/simple/checkbox.ftl b/core/src/main/resources/template/simple/checkbox.ftl
index 0c9d54fe3..d8e4a0fdd 100644
--- a/core/src/main/resources/template/simple/checkbox.ftl
+++ b/core/src/main/resources/template/simple/checkbox.ftl
@@ -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>
diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl
index 36653afc2..e60fbcdfa 100644
--- a/core/src/main/resources/template/simple/combobox.ftl
+++ b/core/src/main/resources/template/simple/combobox.ftl
@@ -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>
 >
diff --git a/core/src/main/resources/template/simple/datepicker.ftl b/core/src/main/resources/template/simple/datepicker.ftl
index de02be59b..8d86570a0 100644
--- a/core/src/main/resources/template/simple/datepicker.ftl
+++ b/core/src/main/resources/template/simple/datepicker.ftl
@@ -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>
 <#--
diff --git a/core/src/main/resources/template/simple/password.ftl b/core/src/main/resources/template/simple/password.ftl
index 9cf4e4888..c0547026f 100644
--- a/core/src/main/resources/template/simple/password.ftl
+++ b/core/src/main/resources/template/simple/password.ftl
@@ -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>
diff --git a/core/src/main/resources/template/simple/textarea.ftl b/core/src/main/resources/template/simple/textarea.ftl
index 2d187eeaa..6f87e9be5 100644
--- a/core/src/main/resources/template/simple/textarea.ftl
+++ b/core/src/main/resources/template/simple/textarea.ftl
@@ -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>
diff --git a/core/src/main/resources/template/simple/timepicker.ftl b/core/src/main/resources/template/simple/timepicker.ftl
index a1e89d3e1..233850898 100644
--- a/core/src/main/resources/template/simple/timepicker.ftl
+++ b/core/src/main/resources/template/simple/timepicker.ftl
@@ -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"