tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-06-26 14:39:31 +02:00
Code Issues Projects Releases Wiki Activity

Fix CheckboxGroupField validation (Fixes #209)

Browse Source
This commit is contained in:
Will Rossiter 2014-07-25 14:52:56 +12:00
parent 9b245ff3fc
commit 5568ee7875
3 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/formfields/UserFormsCheckboxSetField.php Normal file
View File

@ -0,0 +1,23 @@
<?php
/**
* @package userforms
*/
class UserFormsCheckboxSetField extends CheckboxSetField {
/**
* jQuery validate requires that the value of the option does not contain
* the actual value of the input.
*
* @return ArrayList
*/
public function getOptions() {
$options = parent::getOptions();
foreach($options as $option) {
$option->Name = "{$this->name}[]";
}
return $options;
}
}

2
code/model/formfields/EditableCheckboxGroupField.php
View File

@ -19,7 +19,7 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
$optionMap = ($optionSet) ? $optionSet->map('EscapedTitle', 'Title') : array();
return new CheckboxSetField($this->Name, $this->Title, $optionMap);
return new UserFormsCheckboxSetField($this->Name, $this->Title, $optionMap);
}
public function getValueFromData($data) {

24
templates/ValidationScript.ss
View File

@ -1,29 +1,31 @@
(function($) {
$(document).ready(function() {
var messages = {<% loop $Fields %><% if $ErrorMessage && not $SetsOwnError %><% if ClassName == EditableCheckboxGroupField %>
'{$Name.JS}[]': '{$ErrorMessage.JS}'<% else %>
'{$Name.JS}': '{$ErrorMessage.JS}',<% end_if %><% end_if %><% end_loop %>
};
$("#Form_Form").validate({
ignore: ':hidden',
errorClass: "required",
errorElement: "span",
errorPlacement: function(error, element) {
error.addClass('message')
if(element.is(":radio")) {
error.addClass('message');
if(element.is(":radio") || element.parents(".checkboxset").length > 0) {
error.insertAfter(element.closest("ul"));
} else {
error.insertAfter(element);
}
},
messages: {
<% loop $Fields %>
<% if $ErrorMessage && not $SetsOwnError %>
'{$Name.JS}': '{$ErrorMessage.JS}',
<% end_if %>
<% end_loop %>
},
messages: messages,
rules: {
<% loop $Fields %>
<% if $Validation %>
<% if $Validation %><% if ClassName == EditableCheckboxGroupField %>
'{$Name.JS}[]': {$ValidationJSON.RAW}
<% else %>
'{$Name.JS}': {$ValidationJSON.RAW},
<% end_if %>
<% end_if %><% end_if %>
<% end_loop %>
},
<% if $EnableLiveValidation %>