maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-15 11:40:22 +01:00
parent b18afacedb b8f963cd29
commit 4667ccbe43
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customer_tickets.php
View File

@@ -44,15 +44,11 @@ if($page == 'overview') {
$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets"); $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
$fields = array( $fields = array(
'status' => $lng['ticket']['status'], 'status' => $lng['ticket']['status'],
'priority' => $lng['ticket']['priority'],
'lastchange' => $lng['ticket']['lastchange'], 'lastchange' => $lng['ticket']['lastchange'],
'ticket_answers' => $lng['ticket']['ticket_answers'],
'subject' => $lng['ticket']['subject'], 'subject' => $lng['ticket']['subject'],
'lastreplier' => $lng['ticket']['lastreplier'] 'lastreplier' => $lng['ticket']['lastreplier']
); );
$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); $paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
$paging->sortfield = 'lastchange';
$paging->sortorder = 'desc';
$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` $stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
FROM `' . TABLE_PANEL_TICKETS . '` as `main` FROM `' . TABLE_PANEL_TICKETS . '` as `main`

4
templates/Froxlor/customer/tickets/tickets.tpl
View File

@@ -39,11 +39,11 @@ $header
<thead> <thead>
<tr> <tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th> <th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th> <th>{$lng['ticket']['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th> <th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th> <th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th> <th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th> <th>{$lng['ticket']['priority']}</th>
<th>{$lng['panel']['options']}</th> <th>{$lng['panel']['options']}</th>
</tr> </tr>
</thead> </thead>

4
templates/Sparkle/customer/tickets/tickets.tpl vendored
View File

@@ -39,11 +39,11 @@ $header
<thead> <thead>
<tr> <tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th> <th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th> <th>{$lng['ticket']['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th> <th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th> <th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th> <th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th> <th>{$lng['ticket']['priority']}</th>
<th>{$lng['panel']['options']}</th> <th>{$lng['panel']['options']}</th>
</tr> </tr>
</thead> </thead>