diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php index d015d1cfad8bbf536fb74291209f3eb01d34a602..9ce4a5d0fed437a7e35408545afd1309ef6d6b96 100644 --- a/include/staff/tickets.inc.php +++ b/include/staff/tickets.inc.php @@ -106,10 +106,6 @@ case 'search': $tickets = $__tickets; $has_relevance = true; } - if (count($tickets) == 1) { - // Redirect to ticket page - Http::redirect('tickets.php?id='.$tickets[0]->getId()); - } // Clear sticky search queue unset($_SESSION[$queue_key]); break; diff --git a/scp/js/scp.js b/scp/js/scp.js index 28162de01b9a026a35a573f8089a35658c98ebda..2de80670d70a01fbff5d35caa3e9910497464507 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -270,6 +270,9 @@ var scp_prep = function() { var form = $el.closest('form'); form.find('input[name=search-type]').val('typeahead'); $el.val(obj.value); + if (obj.id) { + form.append($('<input type="hidden" name="number">').val(obj.id)) + } form.submit(); }, property: "matches" diff --git a/scp/tickets.php b/scp/tickets.php index fd07aeba550bb811f19f84e1a3e221635166a061..44b474960eb3e7ec0a9cd091ccd3aa79fd1bbbe7 100644 --- a/scp/tickets.php +++ b/scp/tickets.php @@ -27,9 +27,11 @@ $page=''; $ticket = $user = null; //clean start. $redirect = false; //LOCKDOWN...See if the id provided is actually valid and if the user has access. -if($_REQUEST['id']) { - if(!($ticket=Ticket::lookup($_REQUEST['id']))) +if($_REQUEST['id'] || $_REQUEST['number']) { + if($_REQUEST['id'] && !($ticket=Ticket::lookup($_REQUEST['id']))) $errors['err']=sprintf(__('%s: Unknown or invalid ID.'), __('ticket')); + elseif($_REQUEST['number'] && !($ticket=Ticket::lookup(['number' => $_REQUEST['number']]))) + $errors['err']=sprintf(__('%s: Unknown or invalid number.'), __('ticket')); elseif(!$ticket->checkStaffPerm($thisstaff)) { $errors['err']=__('Access denied. Contact admin if you believe this is in error'); $ticket=null; //Clear ticket obj.