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

Merge pull request #99 from greezybacon/issue/99

Looks good

Reviewed By: Peter 06/18/12
parents 1bc9bebf 79cf8129
No related branches found
No related tags found
No related merge requests found
...@@ -402,7 +402,7 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting.. ...@@ -402,7 +402,7 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
<?php <?php
} //end of while. } //end of while.
else: //not tickets found!! set fetch error. else: //not tickets found!! set fetch error.
$ferror='Query returned 0 results.'; $ferror='There are no tickets here. (Leave a little early today).';
endif; ?> endif; ?>
</tbody> </tbody>
<tfoot> <tfoot>
...@@ -414,7 +414,9 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting.. ...@@ -414,7 +414,9 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
<a href="#" onclick="return reset_all(document.forms['tickets'])">None</a>&nbsp;&nbsp; <a href="#" onclick="return reset_all(document.forms['tickets'])">None</a>&nbsp;&nbsp;
<a href="#" onclick="return toogle_all(document.forms['tickets'],true)">Toggle</a>&nbsp;&nbsp; <a href="#" onclick="return toogle_all(document.forms['tickets'],true)">Toggle</a>&nbsp;&nbsp;
<?php }else{ <?php }else{
echo '<i>';
echo $ferror?Format::htmlchars($ferror):'Query returned 0 results.'; echo $ferror?Format::htmlchars($ferror):'Query returned 0 results.';
echo '</i>';
} ?> } ?>
</td> </td>
</tr> </tr>
......
...@@ -378,14 +378,6 @@ endif; ...@@ -378,14 +378,6 @@ endif;
/*... Quick stats ...*/ /*... Quick stats ...*/
$stats= $thisstaff->getTicketsStats(); $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 //Navigation
$nav->setTabActive('tickets'); $nav->setTabActive('tickets');
if($cfg->showAnsweredTickets()) { if($cfg->showAnsweredTickets()) {
...@@ -396,7 +388,7 @@ if($cfg->showAnsweredTickets()) { ...@@ -396,7 +388,7 @@ if($cfg->showAnsweredTickets()) {
(!$_REQUEST['status'] || $_REQUEST['status']=='open')); (!$_REQUEST['status'] || $_REQUEST['status']=='open'));
} else { } else {
if(!$stats || $stats['open']) { if($stats) {
$nav->addSubMenu(array('desc'=>'Open ('.$stats['open'].')', $nav->addSubMenu(array('desc'=>'Open ('.$stats['open'].')',
'title'=>'Open Tickets', 'title'=>'Open Tickets',
'href'=>'tickets.php', 'href'=>'tickets.php',
......
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