diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php index bd4801c445cadc40677b3dcdb3bf163b280abfc8..2c01180495fb73096c9d09555e848177697768c6 100644 --- a/include/staff/tickets.inc.php +++ b/include/staff/tickets.inc.php @@ -402,7 +402,7 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting.. <?php } //end of while. else: //not tickets found!! set fetch error. - $ferror='Query returned 0 results.'; + $ferror='There are no tickets here. (Leave a little early today).'; endif; ?> </tbody> <tfoot> @@ -414,7 +414,9 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting.. <a href="#" onclick="return reset_all(document.forms['tickets'])">None</a> <a href="#" onclick="return toogle_all(document.forms['tickets'],true)">Toggle</a> <?php }else{ + echo '<i>'; echo $ferror?Format::htmlchars($ferror):'Query returned 0 results.'; + echo '</i>'; } ?> </td> </tr> diff --git a/scp/tickets.php b/scp/tickets.php index 801fe242550601501711f96f764b370479b4faf1..7cc7740bb677eeff2bddd177697a661c7da2996d 100644 --- a/scp/tickets.php +++ b/scp/tickets.php @@ -378,14 +378,6 @@ endif; /*... Quick stats ...*/ $stats= $thisstaff->getTicketsStats(); -// Switch queues on the fly! depending on stats -if(!$stats['open'] && $_REQUEST['a']!='search' && (!$_REQUEST['status'] || $_REQUEST['status']=='open')) { - if(!$cfg->showAnsweredTickets() && $stats['answered']) - $_REQUEST['status']= 'answered'; - else - $_REQUEST['status']= 'closed'; -} - //Navigation $nav->setTabActive('tickets'); if($cfg->showAnsweredTickets()) { @@ -396,7 +388,7 @@ if($cfg->showAnsweredTickets()) { (!$_REQUEST['status'] || $_REQUEST['status']=='open')); } else { - if(!$stats || $stats['open']) { + if($stats) { $nav->addSubMenu(array('desc'=>'Open ('.$stats['open'].')', 'title'=>'Open Tickets', 'href'=>'tickets.php',