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: fixed custom rules for radio boxes and checkbox lists

Browse Source
This commit is contained in:
Will Rossiter 2009-05-01 04:11:31 +00:00
parent 34bfd0f8c6
commit cf35c706e4
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
code/UserDefinedForm.php
View File

@ -229,39 +229,64 @@ class UserDefinedForm_Controller extends Page_Controller {
// Check for field dependencies / default
if($field->Dependencies()) {
foreach($field->Dependencies() as $dependency) {
if(is_array($dependency) && isset($dependency['ConditionField']) && $dependency['ConditionField'] != "") {
// get the field which is effected
$formName = Convert::raw2sql($dependency['ConditionField']);
$formFieldWatch = DataObject::get_one("EditableFormField", "Name = '$formName'");
if(!$formFieldWatch) break;
$fieldToWatch = "$(\"#Form_Form_".$dependency['ConditionField']."\")";
// watch out for multiselect options - radios and check boxes
if(is_a($formFieldWatch, 'EditableDropdownField')) {
$fieldToWatch = "$(\"select[name='".$dependency['ConditionField']."]'\")";
}
// watch out for checkboxs as the inputs don't have values but are 'checked
else if(is_a($formFieldWatch, 'EditableCheckboxGroupField')) {
$fieldToWatch = "$(\"input[name='".$dependency['ConditionField']."[".$dependency['Value']."]']\")";
}
else {
$fieldToWatch = "$(\"input[name='".$dependency['ConditionField']."']\")";
}
// show or hide?
$view = (isset($dependency['Display']) && $dependency['Display'] == "Show") ? "show" : "hide";
$opposite = ($view == "show") ? "hide" : "show";
// what action do we need to keep track of
$Action = ($formFieldWatch->ClassName == "EditableTextField") ? "keyup" : "change";
// and what should we evaluate
switch($dependency['ConditionOption']) {
case 'IsNotBlank':
$matches = '!= ""';
$expression = '$(this).val() != ""';
if(is_a($formFieldWatch, 'EditableCheckboxGroupField')) {
$expression = '$(this).attr("checked")';
}
break;
case 'IsBlank':
$matches = '== ""';
$expression = '$(this).val() == ""';
if(is_a($formFieldWatch, 'EditableCheckboxGroupField')) {
$expression = '!($(this).attr("checked"))';
}
break;
case 'HasValue':
$matches = '== "'. $dependency['Value'] .'"';
$expression = '$(this).val() == "'. $dependency['Value'] .'"';
if(is_a($formFieldWatch, 'EditableCheckboxGroupField')) {
$expression = '$(this).attr("checked")';
}
break;
default:
$matches = '!= "'. $dependency['Value'] .'"';
$expression = '$(this).val() != "'. $dependency['Value'] .'"';
if(is_a($formFieldWatch, 'EditableCheckboxGroupField')) {
$expression = '!($(this).attr("checked"))';
}
break;
}
// put it all together
$CustomDisplayRules .= $fieldToWatch.".$Action(function() {
if($(this).val() ". $matches ." ) {
if(". $expression ." ) {
$(\"#". $field->Name ."\").".$view."();
}
else {

3
code/editor/EditableFormField.php
View File

@ -163,10 +163,10 @@ class EditableFormField extends DataObject {
'AddableOption' => true,
'Fields' => $fields
)));
// check for existing ones
if($this->CustomRules) {
$rules = unserialize($this->CustomRules);
if($rules) {
foreach($rules as $rule => $data) {
// recreate all the field object to prevent caching
@ -256,6 +256,7 @@ class EditableFormField extends DataObject {
if(isset($data['CustomRules'])) {
$rules = array();
foreach($data['CustomRules'] as $key => $value) {
if(is_array($value)) {
$fieldValue = (isset($value['Value'])) ? $value['Value'] : '';
if(isset($value['ConditionOption']) && $value['ConditionOption'] == "Blank" || $value['ConditionOption'] == "NotBlank") {

1
code/editor/EditableOption.php
View File

@ -66,6 +66,5 @@ class EditableOption extends DataObject {
$this->readonly = true;
return $this->EditSegment();
}
}
?>