2 files changed, 50 insertions, 0 deletions
diff --git a/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.page b/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.page
new file mode 100644
index 00000000..ad43135b
--- /dev/null
+++ b/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.page
@@ -0,0 +1,30 @@
+<com:TContent ID="Content">
+<h1>Conditional Validation (clientside + server side)</h1>
+<div>
+	<div>
+		<com:TTextBox ID="text1" />
+		<com:TRequiredFieldValidator
+			ID="validator1"
+			ControlToValidate="text1"
+			ErrorMessage="*"
+			ControlCssClass="required"/>
+		<com:TTextBox ID="text2" />
+		<com:TRequiredFieldValidator
+			ID="validator2"
+			ControlToValidate="text2"
+			OnValidate="check_validate"
+			ErrorMessage="*"
+			ControlCssClass="required">
+		<prop:ClientSide.OnValidate>
+			sender.enabled = $('<%= $this->check1->ClientID %>').checked;
+		</prop:ClientSide.OnValidate>
+
+		</com:TRequiredFieldValidator>
+		<com:TCheckBox ID="check1" />
+	</div>
+	<com:TButton ID="submit1" Text="Submit" />
+</div>
+
+
+
+</com:TContent>
+\ No newline at end of file
diff --git a/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.php b/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.php
new file mode 100644
index 00000000..7756566c
--- /dev/null
+++ b/tests/FunctionalTests/validators/protected/pages/ConditionalValidation.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * Created on 27/03/2007
+ */
+
+class ConditionalValidation extends TPage
+{
+	function check_validate($sender, $params)
+	{
+		$sender->enabled = $this->check1->checked;
+	}
+
+	function onPreRender($param)
+	{
+		//always re-enable the validator2 so as to display the client-side validator
+		$this->validator2->enabled=true;
+	}
+}
+
+?>