From e8acb6f151e3e58accb63eac443ffcaaea909a71 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Mon, 11 Sep 2017 11:07:16 -0500
Subject: [PATCH] skip filter actions for disabled depts or help topics
---
include/class.filter_action.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/class.filter_action.php b/include/class.filter_action.php
index dc4eeafd7..22a8a14e7 100644
--- a/include/class.filter_action.php
+++ b/include/class.filter_action.php
@@ -286,8 +286,12 @@ class FA_RouteDepartment extends TriggerAction {
function apply(&$ticket, array $info) {
$config = $this->getConfiguration();
- if ($config['dept_id'])
+ if ($config['dept_id']) {
+ $dept = Dept::lookup($config['dept_id']);
+
+ if ($dept->isActive())
$ticket['deptId'] = $config['dept_id'];
+ }
}
function getConfigurationOptions() {
@@ -416,8 +420,12 @@ class FA_AssignTopic extends TriggerAction {
function apply(&$ticket, array $info) {
$config = $this->getConfiguration();
- if ($config['topic_id'])
+ if ($config['topic_id']) {
+ $topic = Topic::lookup($config['topic_id']);
+
+ if ($topic->isActive())
$ticket['topicId'] = $config['topic_id'];
+ }
}
function getConfigurationOptions() {
--
GitLab