From 31658ea69537688d499a223f60e6939b85fd7b52 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 19 Sep 2014 19:57:19 +0000
Subject: [PATCH] Add cascading propagation to field visibility
Hiding a field triggers visibility check on dependent fields
Use jQuery specific value getters
---
include/class.forms.php | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/include/class.forms.php b/include/class.forms.php
index 939c56965..69c4ebbfe 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1863,6 +1863,10 @@ class ChoicesWidget extends Widget {
}
return $values;
}
+
+ function getJsValueGetter() {
+ return '%s.find(":selected").val()';
+ }
}
class CheckboxWidget extends Widget {
@@ -1895,7 +1899,7 @@ class CheckboxWidget extends Widget {
}
function getJsValueGetter() {
- return '(%s.val() == "on")';
+ return '%s.is(":checked")';
}
}
@@ -2141,13 +2145,22 @@ class VisibilityConstraint {
}
$expression = $this->compileQ($this->constraint, $form);
?>
- target.slideToggle(<?php echo $expression; ?>);
+ if (<?php echo $expression; ?>)
+ target.slideDown('slow', function (){
+ $(this).trigger('show');
+ });
+ else
+ target.slideUp('fast', function (){
+ $(this).trigger('hide');
+ });
};
<?php foreach ($fields as $f) {
$w = $form->getField($f)->getWidget();
?>
$('#<?php echo $w->id; ?>').on('change', <?php echo $func; ?>);
+ $('#field<?php echo $w->id; ?>').on('show hide', <?php
+ echo $func; ?>);
<?php } ?>
})();
</script><?php
@@ -2174,7 +2187,7 @@ class VisibilityConstraint {
switch ($op) {
case 'eq':
case null:
- $expr[] = $wval == $value;
+ $expr[] = ($wval == $value && $field->isVisible());
}
}
}
@@ -2214,9 +2227,12 @@ class VisibilityConstraint {
switch ($op) {
case 'eq':
case null:
- $expr[] = sprintf('%s == %s',
- sprintf($widget->getJsValueGetter(), $id),
- JsonDataEncoder::encode($value));
+ $expr[] = sprintf('(%s.is(":visible") && %s)',
+ $id,
+ sprintf('%s == %s',
+ sprintf($widget->getJsValueGetter(), $id),
+ JsonDataEncoder::encode($value))
+ );
}
}
}
--
GitLab