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

FIX: Dropdowns not responding to conditional logic

Browse Source 
Ensures the correct actions are listened for.
This commit is contained in:
Will Rossiter 2014-12-02 19:49:03 +13:00
parent 7a76626cd2
commit 319d1972b1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/model/UserDefinedForm.php
View File

@ -702,6 +702,7 @@ class UserDefinedForm_Controller extends Page_Controller {
// is this field a special option field
$checkboxField = false;
$radioField = false;
if(in_array($formFieldWatch->ClassName, array('EditableCheckboxGroupField', 'EditableCheckbox'))) {
$action = "click";
$checkboxField = true;
@ -709,7 +710,7 @@ class UserDefinedForm_Controller extends Page_Controller {
else if ($formFieldWatch->ClassName == "EditableRadioField") {
$radioField = true;
}
// Escape the values.
$dependency['Value'] = str_replace('"', '\"', $dependency['Value']);
@ -766,12 +767,13 @@ class UserDefinedForm_Controller extends Page_Controller {
if(!isset($watch[$fieldToWatch])) {
$watch[$fieldToWatch] = array();
}
$watch[$fieldToWatch][] = array(
'expression' => $expression,
'field_id' => $fieldId,
'view' => $view,
'opposite' => $opposite
'opposite' => $opposite,
'action' => $action
);
$watchLoad[$fieldToWatchOnLoad] = true;
@ -785,6 +787,7 @@ class UserDefinedForm_Controller extends Page_Controller {
if($watch) {
foreach($watch as $key => $values) {
$logic = array();
$actions = array();
foreach($values as $rule) {
// Register conditional behaviour with an element, so it can be triggered from many places.
@ -795,6 +798,8 @@ class UserDefinedForm_Controller extends Page_Controller {
$rule['view'],
$rule['opposite']
);
$actions[$rule['action']] = $rule['action'];
}
$logic = implode("\n", $logic);
@ -803,10 +808,11 @@ class UserDefinedForm_Controller extends Page_Controller {
$logic\n
}); \n
});\n";
$rules .= $key.".$action(function() {
foreach($actions as $action) {
$rules .= $key.".$action(function() {
$(this).data('userformConditions').call(this);\n
});\n";
}
}
}