diff --git a/include/class.dept.php b/include/class.dept.php index 1ec4116fb92206c6308842cccd28869b60104104..5a7363a937d94e54277e5094dd8fd8a1886d8174 100644 --- a/include/class.dept.php +++ b/include/class.dept.php @@ -141,6 +141,16 @@ class Dept { return $this->getMembers(array('available'=>1)); } + function getMembersForAlerts() { + if ($this->isGroupMembershipEnabled() == 2) { + // Disabled for this department + $rv = array(); + } + else { + $rv = $this->getAvailableMembers(); + } + return $rv; + } function getSLAId() { return $this->ht['sla_id']; diff --git a/include/class.ticket.php b/include/class.ticket.php index 4b708707f916268bbb4985c52fcf103f0c2629b0..27e293523ba0689f7106e544f8f375e6e0a8bce4 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -938,7 +938,7 @@ class Ticket { //Only alerts dept members if the ticket is NOT assigned. if($cfg->alertDeptMembersONNewTicket() && !$this->isAssigned()) { - if(($members=$dept->getMembers())) + if(($members=$dept->getMembersForAlerts())) $recipients=array_merge($recipients, $members); } @@ -1211,8 +1211,8 @@ class Ticket { $recipients=array_merge($recipients, $members); } elseif($cfg->alertDeptMembersONOverdueTicket() && !$this->isAssigned()) { //Only alerts dept members if the ticket is NOT assigned. - if(($members=$dept->getMembers())) - $recipients=array_merge($recipients, $members); + if ($members = $dept->getMembersForAlerts()) + $recipients = array_merge($recipients, $members); } //Always alert dept manager?? if($cfg->alertDeptManagerONOverdueTicket() && $dept && ($manager=$dept->getManager())) @@ -1409,7 +1409,7 @@ class Ticket { $recipients = array_merge($recipients, $members); } elseif($cfg->alertDeptMembersONTransfer() && !$this->isAssigned()) { //Only alerts dept members if the ticket is NOT assigned. - if(($members=$dept->getMembers())) + if(($members=$dept->getMembersForAlerts())) $recipients = array_merge($recipients, $members); }