From 30472267f3616934e690cbe5436118b0e68980e2 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 18 Mar 2014 13:40:45 -0500
Subject: [PATCH] oops: Fix ambiguous columns and email flags
---
include/api.tickets.php | 1 +
include/staff/tickets.inc.php | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/include/api.tickets.php b/include/api.tickets.php
index 80cdd1f10..60907d56e 100644
--- a/include/api.tickets.php
+++ b/include/api.tickets.php
@@ -40,6 +40,7 @@ class TicketApiController extends ApiController {
$supported = array_merge($supported, array('header', 'mid',
'emailId', 'to-email-id', 'ticketId', 'reply-to', 'reply-to-name',
'in-reply-to', 'references', 'thread-type',
+ 'flags' => array('bounce', 'auto-reply'),
'recipients' => array('*' => array('name', 'email', 'source'))
));
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 18642111a..e38490672 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -90,13 +90,13 @@ if($staffId && ($staffId==$thisstaff->getId())) { //My tickets
$qwhere.=' AND ticket.staff_id='.db_input($staffId);
$showassigned=false; //My tickets...already assigned to the staff.
}elseif($showoverdue) { //overdue
- $qwhere.=' AND isoverdue=1 ';
+ $qwhere.=' AND ticket.isoverdue=1 ';
}elseif($showanswered) { ////Answered
- $qwhere.=' AND isanswered=1 ';
+ $qwhere.=' AND ticket.isanswered=1 ';
}elseif(!strcasecmp($status, 'open') && !$search) { //Open queue (on search OPEN means all open tickets - regardless of state).
//Showing answered tickets on open queue??
if(!$cfg->showAnsweredTickets())
- $qwhere.=' AND isanswered=0 ';
+ $qwhere.=' AND ticket.isanswered=0 ';
/* Showing assigned tickets on open queue?
Don't confuse it with show assigned To column -> F'it it's confusing - just trust me!
@@ -149,7 +149,7 @@ if ($_REQUEST['advsid'] && isset($_SESSION['adv_'.$_REQUEST['advsid']])) {
$sortOptions=array('date'=>'effective_date','ID'=>'ticket.`number`',
'pri'=>'pri.priority_urgency','name'=>'user.name','subj'=>'cdata.subject',
'status'=>'ticket.status','assignee'=>'assigned','staff'=>'staff',
- 'dept'=>'dept_name');
+ 'dept'=>'dept.dept_name');
$orderWays=array('DESC'=>'DESC','ASC'=>'ASC');
@@ -198,10 +198,10 @@ $$x=' class="'.strtolower($order).'" ';
if($_GET['limit'])
$qstr.='&limit='.urlencode($_GET['limit']);
-$qselect ='SELECT ticket.ticket_id,lock_id,`number`,ticket.dept_id,ticket.staff_id,ticket.team_id '
+$qselect ='SELECT ticket.ticket_id,tlock.lock_id,ticket.`number`,ticket.dept_id,ticket.staff_id,ticket.team_id '
.' ,user.name'
- .' ,email.address as email, dept_name '
- .' ,ticket.status,ticket.source,isoverdue,isanswered,ticket.created ';
+ .' ,email.address as email, dept.dept_name '
+ .' ,ticket.status,ticket.source,ticket.isoverdue,ticket.isanswered,ticket.created ';
$qfrom=' FROM '.TICKET_TABLE.' ticket '.
' LEFT JOIN '.USER_TABLE.' user ON user.id = ticket.user_id'.
--
GitLab