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

Fixes malformed priority in ticket archive search, fixes #714

Browse Source 
Note: swedish could not be fixed and my swedish is way to bad to do it on my own
Thanks to philnate
This commit is contained in:
Andreas Burchert (scarya)
2011-09-19 11:11:26 +02:00
parent 8e07768996
commit 84f00a2519
14 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/190.ticket.php
View File

@@ -133,7 +133,7 @@ return array(
'type' => 'option', 'type' => 'option',
'default' => 2, 'default' => 2,
'option_mode' => 'one', 'option_mode' => 'one',
'option_options' => array(1 => $lng['ticket']['unf_high'], 2 => $lng['ticket']['unf_normal'], 3 => $lng['ticket']['unf_low']), 'option_options' => array(1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']),
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
), ),

24
admin_tickets.php
View File

@@ -224,9 +224,9 @@ if($page == 'tickets'
$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']); $customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
} }
$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); $priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']);
$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); $priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']);
$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); $priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']);
$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_new.php'; $ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_new.php';
$ticket_new_form = htmlform::genHTMLForm($ticket_new_data); $ticket_new_form = htmlform::genHTMLForm($ticket_new_data);
@@ -673,6 +673,16 @@ elseif($page == 'archive'
} }
$tickets_count++; $tickets_count++;
switch ($ticket['priority'])
{
case 1: $ticket['display'] = 'high';
break;
case 2: $ticket['display'] = 'normal';
break;
case 3: $ticket['display'] = 'low';
break;
default: $ticket['display'] = 'unknown';
}
$ticket['priority'] = ticket::getPriorityText($lng, $ticket['priority']); $ticket['priority'] = ticket::getPriorityText($lng, $ticket['priority']);
if($ticket['lastreplier'] == '1') if($ticket['lastreplier'] == '1')
@@ -688,9 +698,7 @@ elseif($page == 'archive'
{ {
$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...'; $ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
} }
$ticket = htmlentities_array($ticket); $ticket = htmlentities_array($ticket);
eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";"); eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";");
$count++; $count++;
$_cid = $ticket['customerid']; $_cid = $ticket['customerid'];
@@ -733,9 +741,9 @@ elseif($page == 'archive'
} }
} }
$priorities_options = makecheckbox('priority1', $lng['ticket']['unf_high'], '1'); $priorities_options = makecheckbox('priority1', $lng['ticket']['high'], '1');
$priorities_options.= makecheckbox('priority2', $lng['ticket']['unf_normal'], '2'); $priorities_options.= makecheckbox('priority2', $lng['ticket']['normal'], '2');
$priorities_options.= makecheckbox('priority3', $lng['ticket']['unf_low'], '3'); $priorities_options.= makecheckbox('priority3', $lng['ticket']['low'], '3');
$category_options = ''; $category_options = '';
$ccount = 0; $ccount = 0;
$result = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC'); $result = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');

6
customer_tickets.php
View File

@@ -227,9 +227,9 @@ elseif($page == 'tickets')
$categories = makeoption($lng['ticket']['no_cat'], '0'); $categories = makeoption($lng['ticket']['no_cat'], '0');
} }
$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); $priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']);
$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); $priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']);
$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); $priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']);
$ticketsopen = 0; $ticketsopen = 0;
$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '` $opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
WHERE `customerid` = "' . $userinfo['customerid'] . '" WHERE `customerid` = "' . $userinfo['customerid'] . '"

6
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -73,9 +73,9 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
$description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.'; $description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
$question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;'; $question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;';
$question .= '<select name="update_deftic_priority">'; $question .= '<select name="update_deftic_priority">';
$priorities = makeoption($lng['ticket']['unf_high'], '1', '2'); $priorities = makeoption($lng['ticket']['high'], '1', '2');
$priorities.= makeoption($lng['ticket']['unf_normal'], '2', '2'); $priorities.= makeoption($lng['ticket']['normal'], '2', '2');
$priorities.= makeoption($lng['ticket']['unf_low'], '3', '2'); $priorities.= makeoption($lng['ticket']['low'], '3', '2');
$question .= $priorities.'</select>'; $question .= $priorities.'</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
} }

9
lng/czech.lng.php
View File

@@ -606,12 +606,9 @@ $lng['ticket']['subject'] = 'P&oslash;edm&igrave; t';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = 'Posledn&iacute; odpov&iacute;daj&iacute;c&iacute;'; $lng['ticket']['lastreplier'] = 'Posledn&iacute; odpov&iacute;daj&iacute;c&iacute;';
$lng['ticket']['priority'] = 'Priorita'; $lng['ticket']['priority'] = 'Priorita';
$lng['ticket']['low'] = '<span class="ticket_low">N&iacute;zk&aacute;</span>'; $lng['ticket']['low'] = 'N&iacute;zk&aacute;';
$lng['ticket']['normal'] = '<span class="ticket_normal">Norm&aacute;ln&iacute;</span>'; $lng['ticket']['normal'] = 'Norm&aacute;ln&iacute;';
$lng['ticket']['high'] = '<span class="ticket_high">Vysok&aacute;</span>'; $lng['ticket']['high'] = 'Vysok&aacute;';
$lng['ticket']['unf_low'] = 'N&iacute;zk&aacute;';
$lng['ticket']['unf_normal'] = 'Norm&aacute;ln&iacute;';
$lng['ticket']['unf_high'] = 'Vysok&aacute;';
$lng['ticket']['lastchange'] = 'Posledn&iacute; zm&igrave; na'; $lng['ticket']['lastchange'] = 'Posledn&iacute; zm&igrave; na';
$lng['ticket']['lastchange_from'] = 'Od data (dd.mm.yyyy)'; $lng['ticket']['lastchange_from'] = 'Od data (dd.mm.yyyy)';
$lng['ticket']['lastchange_to'] = 'Do data (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Do data (dd.mm.yyyy)';

9
lng/dutch.lng.php
View File

@@ -601,12 +601,9 @@ $lng['ticket']['subject'] = 'Onderwerp';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = 'Laatste beantwoorder'; $lng['ticket']['lastreplier'] = 'Laatste beantwoorder';
$lng['ticket']['priority'] = 'Prioriteit'; $lng['ticket']['priority'] = 'Prioriteit';
$lng['ticket']['low'] = '<span class="ticket_low">Laag</span>'; $lng['ticket']['low'] = 'Laag';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normaal</span>'; $lng['ticket']['normal'] = 'Normaal';
$lng['ticket']['high'] = '<span class="ticket_high">Hoog</span>'; $lng['ticket']['high'] = 'Hoog';
$lng['ticket']['unf_low'] = 'Laag';
$lng['ticket']['unf_normal'] = 'Normaal';
$lng['ticket']['unf_high'] = 'Hoog';
$lng['ticket']['lastchange'] = 'Laatste wijziging'; $lng['ticket']['lastchange'] = 'Laatste wijziging';
$lng['ticket']['lastchange_from'] = 'Datum vanaf (dd.mm.yyyy)'; $lng['ticket']['lastchange_from'] = 'Datum vanaf (dd.mm.yyyy)';
$lng['ticket']['lastchange_to'] = 'Datum tot (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Datum tot (dd.mm.yyyy)';

9
lng/english.lng.php
View File

@@ -611,12 +611,9 @@ $lng['ticket']['subject'] = 'Subject';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = 'Last replier'; $lng['ticket']['lastreplier'] = 'Last replier';
$lng['ticket']['priority'] = 'Priority'; $lng['ticket']['priority'] = 'Priority';
$lng['ticket']['low'] = '<span class="ticket_low">Low</span>'; $lng['ticket']['low'] = 'Low';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normal</span>'; $lng['ticket']['normal'] = 'Normal';
$lng['ticket']['high'] = '<span class="ticket_high">High</span>'; $lng['ticket']['high'] = 'High';
$lng['ticket']['unf_low'] = 'Low';
$lng['ticket']['unf_normal'] = 'Normal';
$lng['ticket']['unf_high'] = 'High';
$lng['ticket']['lastchange'] = 'Last change'; $lng['ticket']['lastchange'] = 'Last change';
$lng['ticket']['lastchange_from'] = 'From date (dd.mm.yyyy)'; $lng['ticket']['lastchange_from'] = 'From date (dd.mm.yyyy)';
$lng['ticket']['lastchange_to'] = 'To date (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'To date (dd.mm.yyyy)';

9
lng/french.lng.php
View File

@@ -618,12 +618,9 @@ $lng['ticket']['subject'] = 'Sujet';
$lng['ticket']['status'] = 'Etat'; $lng['ticket']['status'] = 'Etat';
$lng['ticket']['lastreplier'] = 'Derni&egrave;re r&eacute;ponse de'; $lng['ticket']['lastreplier'] = 'Derni&egrave;re r&eacute;ponse de';
$lng['ticket']['priority'] = 'Priorit&eacute;'; $lng['ticket']['priority'] = 'Priorit&eacute;';
$lng['ticket']['low'] = '<span class="ticket_low">Basse</span>'; $lng['ticket']['low'] = 'Basse';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normale</span>'; $lng['ticket']['normal'] = 'Normale';
$lng['ticket']['high'] = '<span class="ticket_high">Haute</span>'; $lng['ticket']['high'] = 'Haute';
$lng['ticket']['unf_low'] = 'Basse';
$lng['ticket']['unf_normal'] = 'Normale';
$lng['ticket']['unf_high'] = 'Haute';
$lng['ticket']['lastchange'] = 'Dernier changement'; $lng['ticket']['lastchange'] = 'Dernier changement';
$lng['ticket']['lastchange_from'] = 'Depuis (jj.mm.aaaa)'; $lng['ticket']['lastchange_from'] = 'Depuis (jj.mm.aaaa)';
$lng['ticket']['lastchange_to'] = 'Jusqu\'au (jj.mm.aaaa)'; $lng['ticket']['lastchange_to'] = 'Jusqu\'au (jj.mm.aaaa)';

9
lng/german.lng.php
View File

@@ -614,12 +614,9 @@ $lng['ticket']['subject'] = 'Betreff';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = 'Letzte Antwort'; $lng['ticket']['lastreplier'] = 'Letzte Antwort';
$lng['ticket']['priority'] = 'Priorit&auml;t'; $lng['ticket']['priority'] = 'Priorit&auml;t';
$lng['ticket']['low'] = '<span class="ticket_low">Niedrig</span>'; $lng['ticket']['low'] = 'Niedrig';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normal</span>'; $lng['ticket']['normal'] = 'Normal';
$lng['ticket']['high'] = '<span class="ticket_high">Hoch</span>'; $lng['ticket']['high'] = 'Hoch';
$lng['ticket']['unf_low'] = 'Niedrig';
$lng['ticket']['unf_normal'] = 'Normal';
$lng['ticket']['unf_high'] = 'Hoch';
$lng['ticket']['lastchange'] = 'Letzte &Auml;nderung'; $lng['ticket']['lastchange'] = 'Letzte &Auml;nderung';
$lng['ticket']['lastchange_from'] = 'Anfangsdatum (tt.mm.jjjj)'; $lng['ticket']['lastchange_from'] = 'Anfangsdatum (tt.mm.jjjj)';
$lng['ticket']['lastchange_to'] = 'Enddatum (tt.mm.jjjj)'; $lng['ticket']['lastchange_to'] = 'Enddatum (tt.mm.jjjj)';

9
lng/italian.lng.php
View File

@@ -614,12 +614,9 @@ $lng['ticket']['subject'] = 'Soggetto';
$lng['ticket']['status'] = 'Stato'; $lng['ticket']['status'] = 'Stato';
$lng['ticket']['lastreplier'] = 'Ultimo che ha risposto'; $lng['ticket']['lastreplier'] = 'Ultimo che ha risposto';
$lng['ticket']['priority'] = 'Priorit&agrave;'; $lng['ticket']['priority'] = 'Priorit&agrave;';
$lng['ticket']['low'] = '<span class="ticket_low">Bassa</span>'; $lng['ticket']['low'] = 'Bassa';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normale</span>'; $lng['ticket']['normal'] = 'Normale';
$lng['ticket']['high'] = '<span class="ticket_high">Alta</span>'; $lng['ticket']['high'] = 'Alta';
$lng['ticket']['unf_low'] = 'Bassa';
$lng['ticket']['unf_normal'] = 'Normale';
$lng['ticket']['unf_high'] = 'Alta';
$lng['ticket']['lastchange'] = 'Ultima modifica'; $lng['ticket']['lastchange'] = 'Ultima modifica';
$lng['ticket']['lastchange_from'] = 'Dalla data (dd.mm.yyyy)'; $lng['ticket']['lastchange_from'] = 'Dalla data (dd.mm.yyyy)';
$lng['ticket']['lastchange_to'] = 'Alla data (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Alla data (dd.mm.yyyy)';

9
lng/polish.lng.php
View File

@@ -607,12 +607,9 @@ $lng['ticket']['subject'] = 'Temat';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = 'Ostatnia odpowied&#378'; $lng['ticket']['lastreplier'] = 'Ostatnia odpowied&#378';
$lng['ticket']['priority'] = 'Priorytet'; $lng['ticket']['priority'] = 'Priorytet';
$lng['ticket']['low'] = '<span class="ticket_low">Niski</span>'; $lng['ticket']['low'] = 'Niski';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normalny</span>'; $lng['ticket']['normal'] = 'Normalny';
$lng['ticket']['high'] = '<span class="ticket_high">Wysoki</span>'; $lng['ticket']['high'] = 'Wysoki';
$lng['ticket']['unf_low'] = 'Niski';
$lng['ticket']['unf_normal'] = 'Normalny';
$lng['ticket']['unf_high'] = 'Wysoki';
$lng['ticket']['lastchange'] = 'Ostatnia zmiana'; $lng['ticket']['lastchange'] = 'Ostatnia zmiana';
$lng['ticket']['lastchange_from'] = 'Od daty (dd.mm.yyyy)'; $lng['ticket']['lastchange_from'] = 'Od daty (dd.mm.yyyy)';
$lng['ticket']['lastchange_to'] = 'Do daty (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Do daty (dd.mm.yyyy)';

9
lng/portugues.lng.php
View File

@@ -542,12 +542,9 @@ $lng['ticket']['subject'] = 'Assunto';
$lng['ticket']['status'] = 'Status'; $lng['ticket']['status'] = 'Status';
$lng['ticket']['lastreplier'] = '&Uacute;ltimo que respondeu'; $lng['ticket']['lastreplier'] = '&Uacute;ltimo que respondeu';
$lng['ticket']['priority'] = 'Prioridade'; $lng['ticket']['priority'] = 'Prioridade';
$lng['ticket']['low'] = '<span class="ticket_low">Baixa</span>'; $lng['ticket']['low'] = 'Baixa';
$lng['ticket']['normal'] = '<span class="ticket_normal">Normal</span>'; $lng['ticket']['normal'] = 'Normal';
$lng['ticket']['high'] = '<span class="ticket_high">Alta</span>'; $lng['ticket']['high'] = 'Alta';
$lng['ticket']['unf_low'] = 'Baixa';
$lng['ticket']['unf_normal'] = 'Normal';
$lng['ticket']['unf_high'] = 'Alta';
$lng['ticket']['lastchange_from'] = 'De data (dd.mm.aaaa)'; $lng['ticket']['lastchange_from'] = 'De data (dd.mm.aaaa)';
$lng['ticket']['lastchange_to'] = 'At&eacute; data (dd.mm.aaaa)'; $lng['ticket']['lastchange_to'] = 'At&eacute; data (dd.mm.aaaa)';
$lng['ticket']['category'] = 'Categoria'; $lng['ticket']['category'] = 'Categoria';

2
templates/Classic/admin/tickets/archived_tickets.tpl
View File

@@ -3,7 +3,7 @@
<td class="field_name">{$ticket['ticket_answers']}</td> <td class="field_name">{$ticket['ticket_answers']}</td>
<td class="field_name">{$ticket['subject']}</td> <td class="field_name">{$ticket['subject']}</td>
<td class="field_name">{$ticket['lastreplier']}</td> <td class="field_name">{$ticket['lastreplier']}</td>
<td class="field_name">{$ticket['priority']}</td> <td class="field_name"><span class="ticket_{$ticket['display']}">{$ticket['priority']}</span></td>
<td class="field_name"> <td class="field_name">
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}">{$lng['ticket']['show']}</a> <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}">{$lng['ticket']['show']}</a>
</td> </td>

2
templates/Froxlor/admin/tickets/archived_tickets.tpl
View File

@@ -3,7 +3,7 @@
<td>{$ticket['ticket_answers']}</td> <td>{$ticket['ticket_answers']}</td>
<td>{$ticket['subject']}</td> <td>{$ticket['subject']}</td>
<td>{$ticket['lastreplier']}</td> <td>{$ticket['lastreplier']}</td>
<td>{$ticket['priority']}</td> <td><span class="ticket_{$ticket['display']}">{$ticket['priority']}</span></td>
<td> <td>
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}" style="text-decoration:none;"> <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}" style="text-decoration:none;">
<img src="images/Froxlor/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/> <img src="images/Froxlor/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>