tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: avoid validating fields which have the potential to be hidden. Fixes #5406 and #3

Browse Source
This commit is contained in:
Will Rossiter 2012-04-14 21:59:27 +12:00
parent 2c9e68a928
commit 0978a1ebf8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/model/UserDefinedForm.php
View File

@ -345,7 +345,7 @@ class UserDefinedForm_Controller extends Page_Controller {
// get the required fields including the validation
$required = $this->getRequiredFields();
// generate the conditional logic
$this->generateConditionalJavascript();
@ -445,8 +445,8 @@ class UserDefinedForm_Controller extends Page_Controller {
if($this->Fields()) {
foreach($this->Fields() as $field) {
$messages[$field->Name] = $field->getErrorMessage()->HTML();
if($field->Required) {
if($field->Required && $field->CustomRules()->Count() == 0) {
$rules[$field->Name] = array_merge(array('required' => true), $field->getValidation());
$required->addRequiredField($field->Name);
}
@ -462,6 +462,7 @@ class UserDefinedForm_Controller extends Page_Controller {
(function($) {
$(document).ready(function() {
$("#Form_Form").validate({
ignore: [':hidden'],
errorClass: "required",
messages:
$messages
@ -632,13 +633,13 @@ JS
* @return Redirection
*/
function process($data, $form) {
Session::set("FormInfo.{$form->FormName()}.data",$data);
Session::clear("FormInfo.{$form->FormName()}.errors");
foreach($this->Fields() as $field) {
$messages[$field->Name] = $field->getErrorMessage()->HTML();
if($field->Required){
if($field->Required && $field->CustomRules()->Count() == 0) {
if( !isset($data[$field->Name]) ||
!$data[$field->Name] ||
!$field->getFormField()->validate($this->validator)