Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#209 Fix checkboxes on search screen and use correct status on ticket table

Browse Source
This commit is contained in:
Mike Koch 2015-07-28 22:09:34 -04:00
parent c9360fd538
commit 05063218c4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/print_tickets.inc.php
View File

@ -118,17 +118,16 @@ $possible_status = array();
$results = hesk_dbQuery($statusSql); $results = hesk_dbQuery($statusSql);
while ($row = $results->fetch_assoc()) while ($row = $results->fetch_assoc())
{ {
array_push($possible_status, $row['ID']); $possible_status[$row['ID']] = $row['ID'];
$totalStatuses++; $totalStatuses++;
} }
$status = $possible_status; $status = $possible_status;
// Process statuses unless overridden with "s_all" variable // Process statuses unless overridden with "s_all" variable
if ( ! hesk_GET('s_all') ) if ( ! hesk_GET('s_all') )
{ {
foreach ($status as $k => $v) foreach ($status as $k => $v)
{ {
if (empty($_GET['s' . $k])) if (empty($_GET['s' . $v]))
{ {
unset($status[$k]); unset($status[$k]);
} }

2
inc/show_search_form.inc.php
View File

@ -132,7 +132,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
<?php <?php
$rowCounter = 1; $rowCounter = 1;
$statusRS = hesk_dbQuery('SELECT `ID`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`'); $statusRS = hesk_dbQuery('SELECT `ID`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
while ($row = $statusRS->fetch_assoc()) while ($row = hesk_dbFetchAssoc($statusRS))
{ {
if ($rowCounter > 3) if ($rowCounter > 3)
{ {

5
inc/ticket_list.inc.php
View File

@ -404,8 +404,9 @@ if ($total > 0)
// Print ticket status // Print ticket status
if ( hesk_show_column('status') ) if ( hesk_show_column('status') )
{ {
$statusName = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `Key`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status'])); $statusRS = hesk_dbQuery("SELECT `ID`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status']);
$ticket['status']='<span style="color: '.$statusName['TextColor'].'">'.$hesklang[$statusName['Key']].'</span>'; $statusName = hesk_dbFetchAssoc($statusRS);
$ticket['status']='<span style="color: '.$statusName['TextColor'].'">'.mfh_getDisplayTextForStatusId($statusName['ID']).'</span>';
echo '<td class="'.$color.'">'.$ticket['status'].'&nbsp;</td>'; echo '<td class="'.$color.'">'.$ticket['status'].'&nbsp;</td>';
} }