Skip to content
Snippets Groups Projects
Commit 11dad9b5 authored by Peter Rotich's avatar Peter Rotich
Browse files

Misc. Fixes

parent cefe6848
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ class TicketApiController extends ApiController { ...@@ -40,7 +40,7 @@ class TicketApiController extends ApiController {
if(!strcasecmp($format, 'email')) { if(!strcasecmp($format, 'email')) {
$supported = array_merge($supported, array('header', 'mid', $supported = array_merge($supported, array('header', 'mid',
'emailId', 'to-email-id', 'ticketId', 'reply-to', 'reply-to-name', 'emailId', 'to-email-id', 'ticketId', 'reply-to', 'reply-to-name',
'in-reply-to', 'references', 'thread-type', 'in-reply-to', 'references', 'thread-type', 'system_emails',
'mailflags' => array('bounce', 'auto-reply', 'spam', 'viral'), 'mailflags' => array('bounce', 'auto-reply', 'spam', 'viral'),
'recipients' => array('*' => array('name', 'email', 'source')) 'recipients' => array('*' => array('name', 'email', 'source'))
)); ));
......
...@@ -559,7 +559,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable { ...@@ -559,7 +559,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable, Searchable {
$assigned->add(array('thread__referrals__agent__staff_id' => $this->getId())); $assigned->add(array('thread__referrals__agent__staff_id' => $this->getId()));
// -- Open and assigned to a team of mine // -- Open and assigned to a team of mine
if ($teams = array_filter($this->getTeams())) { if (($teams = array_filter($this->getTeams()))) {
$assigned->add(array('team_id__in' => $teams)); $assigned->add(array('team_id__in' => $teams));
$assigned->add(array('thread__referrals__team__team_id__in' => $teams)); $assigned->add(array('thread__referrals__team__team_id__in' => $teams));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment