From 1d3d30958260344a323e33160f6c0afe1c52a8d0 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 25 Jun 2009 06:55:42 +0000
Subject: [PATCH] BUGFIX: fixed issue with rule based validation trying to save
 the default rule

---
 css/FieldEditor.css              |  2 +-
 javascript/UserForm.js           |  4 +---
 templates/EditableFormField.ss   | 11 +++++++++--
 templates/Includes/CustomRule.ss |  8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/css/FieldEditor.css b/css/FieldEditor.css
index 7ca4647..b87be96 100755
--- a/css/FieldEditor.css
+++ b/css/FieldEditor.css
@@ -195,7 +195,7 @@
 				}
 				
 		/* HIDE */
-		#Fields_fields li.EditableFormField div.hidden {
+		#Fields_fields li.EditableFormField .hidden {
 			display: none;
 		}
 
diff --git a/javascript/UserForm.js b/javascript/UserForm.js
index d760ad0..f088233 100644
--- a/javascript/UserForm.js
+++ b/javascript/UserForm.js
@@ -59,9 +59,7 @@
 					//update the internal lists
 					var name = $("#Fields_fields li.EditableFormField:last").attr("id").split(' ');
 
-					$("#Fields_fields select.fieldOption").each(function(i, domElement) {
-						$(domElement).append("<option value='"+ name[2] +"'>New "+ name[2] + "</option>");
-					});
+					$("#Fields_fields select.fieldOption").append("<option value='"+ name[2] +"'>New "+ name[2] + "</option>");
 				},
 				
 				// error creating new field
diff --git a/templates/EditableFormField.ss b/templates/EditableFormField.ss
index 1fef3b6..a6254dc 100755
--- a/templates/EditableFormField.ss
+++ b/templates/EditableFormField.ss
@@ -91,7 +91,14 @@
 
 						<label><% _t('WHEN', 'When') %></label>
 						<select class="fieldOption customRuleField" name="{$FieldName}[CustomRules][ConditionField]">
-				
+							<option></option>
+							<% control Parent %>
+								<% if Fields %>
+									<% control Fields %>
+										<option value="$Name"><% if Title %>$Title<% else %>$Name<% end_if %></option>
+									<% end_control %>
+								<% end_if %>
+							<% end_control %>
 						</select>
 
 						<label><% _t('IS', 'Is') %></label>
@@ -120,5 +127,5 @@
 	<!-- Hidden option Fields -->
   	<input type="hidden" class="canDeleteHidden" name="{$FieldName}[CanDelete]" value="$CanDelete" />
   	<input type="hidden" class="typeHidden" name="{$FieldName}[Type]" value="$ClassName" />   
-		<input type="hidden" class="sortHidden" name="{$FieldName}[Sort]" value="$Sort" />
+	<input type="hidden" class="sortHidden" name="{$FieldName}[Sort]" value="$Sort" />
 </li>
\ No newline at end of file
diff --git a/templates/Includes/CustomRule.ss b/templates/Includes/CustomRule.ss
index 87872d0..22b6be9 100644
--- a/templates/Includes/CustomRule.ss
+++ b/templates/Includes/CustomRule.ss
@@ -1,10 +1,10 @@
-<select class="displayOption customRuleField" name="{$Name}[CustomRules][$Pos][Display]">
+<select class="displayOption customRuleField" name="{$FieldName}[CustomRules][$Pos][Display]">
 	<option value="Show" <% if Display = Show %>selected="selected"<% end_if %>><% _t('SHOWTHISFIELD', 'Show This Field') %></option>
 	<option value="Hide" <% if Display = Hide %><% if First %><% else %>selected="selected"<% end_if %><% end_if %>><% _t('HIDETHISFIELD', 'Hide This Field') %></option>
 </select>
 
 <label><% _t('WHEN', 'When') %></label>
-<select class="fieldOption customRuleField" name="{$Name}[CustomRules][$Pos][ConditionField]">
+<select class="fieldOption customRuleField" name="{$FieldName}[CustomRules][$Pos][ConditionField]">
 	<option value="" selected="selected"></option>
 	<% control Fields %>
 		<option value="$BaseName" <% if isSelected %>selected="selected"<% end_if %>>$Title</option>
@@ -12,7 +12,7 @@
 </select>
 
 <label><% _t('IS', 'Is') %></label>
-<select class="conditionOption customRuleField" name="{$Name}[CustomRules][$Pos][ConditionOption]">
+<select class="conditionOption customRuleField" name="{$FieldName}[CustomRules][$Pos][ConditionOption]">
 	<option value=""></option>
 	<option value="IsBlank" <% if ConditionOption = IsBlank %>selected="selected"<% end_if %>><% _t('BLANK', 'Blank') %></option>
 	<option value="IsNotBlank" <% if ConditionOption = IsNotBlank %>selected="selected"<% end_if %>><% _t('NOTBLANK', 'Not Blank') %></option>
@@ -20,6 +20,6 @@
 	<option value="ValueNot" <% if ConditionOption = ValueNot %>selected="selected"<% end_if %>><% _t('NOTVALUE', 'Not Value') %></option>
 </select>
 
-<input type="text" class="ruleValue <% if Value %><% else %>hidden<% end_if %> customRuleField" name="{$Name}[CustomRules][$Pos][Value]" value="$Value" />
+<input type="text" class="ruleValue <% if Value %><% else %>hidden<% end_if %> customRuleField" name="{$FieldName}[CustomRules][$Pos][Value]" value="$Value" />
 
 <a href="#" class="deleteCondition" title="<% _t('DELETE', 'Delete') %>"><img src="cms/images/delete.gif" alt="<% _t('DELETE', 'Delete') %>" /></a>