From 71d0d4223df92f8a3f65488ea41f0b0447be5484 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Sun, 6 Dec 2009 22:41:47 +0000
Subject: [PATCH] BUGFIX: fixed conflict with field and method naming. Removed
 unneeded field from model

---
 code/editor/EditableFormField.php | 5 ++---
 templates/EditableFormField.ss    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/editor/EditableFormField.php b/code/editor/EditableFormField.php
index ff66ca4..b857f79 100755
--- a/code/editor/EditableFormField.php
+++ b/code/editor/EditableFormField.php
@@ -18,8 +18,7 @@ class EditableFormField extends DataObject {
 		"CanDelete" => "Boolean",
 		"CustomErrorMessage" => "Varchar(255)",
 		"CustomRules" => "Text",
-		"CustomSettings" => "Text",
-		"ShowOnLoad" => "Boolean"
+		"CustomSettings" => "Text"
 	);
     
 	static $defaults = array(
@@ -86,7 +85,7 @@ class EditableFormField extends DataObject {
 	 *
 	 * @return bool
 	 */
-	function ShowOnLoad() {
+	function getShowOnLoad() {
 		return ($this->getSetting('ShowOnLoad') == "Show" || $this->getSetting('ShowOnLoad') == '') ? true : false;
 	}
 	
diff --git a/templates/EditableFormField.ss b/templates/EditableFormField.ss
index ee8547d..2602f6d 100755
--- a/templates/EditableFormField.ss
+++ b/templates/EditableFormField.ss
@@ -73,7 +73,7 @@
 					<li>
 						<a href="#" class="addCondition" title="<% _t('ADD', 'Add') %>"><% _t('ADDRULE', 'Add Rule') %></a>
 					</li>
-					<li class="addCustomRule">
+					<li class="addCustomRule">					
 						<select name="{$FieldName}[CustomSettings][ShowOnLoad]">
 							<option value="Show" <% if ShowOnLoad %>selected="selected"<% end_if %>><% _t('SHOW', 'Show') %></option>
 							<option value="Hide" <% if ShowOnLoad %><% else %>selected="selected"<% end_if %>><% _t('HIDE', 'Hide') %></option>