From 3d45adc5f47cfe1813502a30922d5eb326ea351b Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Wed, 12 Sep 2018 14:49:42 -0500
Subject: [PATCH] Filter Action Validation Fixes
- Let validate_actions pass if we are trying to disable/archive a Help Topic so that the filter flag can be set.
- Make sure we do not throw validation errors when deleting a filter action. Just delete it.
---
include/class.filter.php | 46 +++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index 08b42338b..05f93c784 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -149,6 +149,7 @@ class Filter {
else
$this->ht['flags'] &= ~$flag;
$vars['rules']= $this->getRules();
+ $this->ht['pass'] = true;
$this->update($this->ht, $errors);
}
@@ -538,6 +539,10 @@ class Filter {
}
function validate_actions($vars, &$errors) {
+ //allow the save if it is to set a filter flag
+ if ($vars['pass'])
+ return true;
+
if (!is_array(@$vars['actions']))
return;
@@ -569,26 +574,29 @@ class Filter {
}
}
- switch ($action->ht['type']) {
- case 'dept':
- $dept = Dept::lookup($config['dept_id']);
- if (!$dept || !$dept->isActive()) {
- $errors['err'] = sprintf(__('Unable to save: Please choose an active %s'), 'Department');
- }
- break;
- case 'topic':
- $topic = Topic::lookup($config['topic_id']);
- if (!$topic || !$topic->isActive()) {
- $errors['err'] = sprintf(__('Unable to save: Please choose an active %s'), 'Help Topic');
- }
- break;
- default:
- foreach ($config as $key => $value) {
- if (!$value) {
- $errors['err'] = sprintf(__('Unable to save: Please insert a value for %s'), ucfirst($action->ht['type']));
- }
+ // do not throw an error if we are deleting an action
+ if (substr($v, 0, 1) != 'D') {
+ switch ($action->ht['type']) {
+ case 'dept':
+ $dept = Dept::lookup($config['dept_id']);
+ if (!$dept || !$dept->isActive()) {
+ $errors['err'] = sprintf(__('Unable to save: Please choose an active %s'), 'Department');
+ }
+ break;
+ case 'topic':
+ $topic = Topic::lookup($config['topic_id']);
+ if (!$topic || !$topic->isActive()) {
+ $errors['err'] = sprintf(__('Unable to save: Please choose an active %s'), 'Help Topic');
+ }
+ break;
+ default:
+ foreach ($config as $key => $value) {
+ if (!$value) {
+ $errors['err'] = sprintf(__('Unable to save: Please insert a value for %s'), ucfirst($action->ht['type']));
+ }
+ }
+ break;
}
- break;
}
}
--
GitLab