From 7a9e20557bb5554a918d6dc85fc9ec4d5b3d16ff Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 15 May 2015 01:34:37 -0400 Subject: [PATCH] Closes #237 Add options to show # of merged tickets in ticket table --- admin/admin_settings.php | 30 ++++++++++++++++++++++++------ admin/admin_settings_save.php | 6 +++++- inc/print_tickets.inc.php | 3 ++- inc/ticket_list.inc.php | 19 ++++++++++++++++++- js/modsForHesk-javascript.js | 6 ++++++ language/en/text.php | 5 +++++ modsForHesk_settings.inc.php | 5 ++++- 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index d607e247..4b5cf991 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -2049,8 +2049,8 @@ if ( defined('HESK_DEMO') )
- -
+ +
$title) @@ -2064,10 +2064,28 @@ if ( defined('HESK_DEMO') ) ?>
+
+ +
+
+ +
+
+
- -
+ +
- -
+ +
$v) diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php index 04f4030e..6409da7a 100644 --- a/inc/ticket_list.inc.php +++ b/inc/ticket_list.inc.php @@ -321,7 +321,24 @@ if ($total > 0) // Print tracking ID and link it to the ticket page if ( hesk_show_column('trackid') ) { - echo ''.$ticket['trackid'].''; + echo ' + '.$ticket['trackid'].''; + if ($modsForHesk_settings['show_number_merged'] && $ticket['merged'] != '') { + $tooltipMarkup = $hesklang['merged_tickets']; + $mergedIds = explode('#', $ticket['merged']); + $mergedTickets = ''; + $numberOfTickets = 0; + foreach ($mergedIds as $mergeId) { + if ($mergeId != '') { + $numberOfTickets++; + $mergedTickets .= '
  • ' . $mergeId . '
    • '; + } + } + $tooltipMarkup .= '
      '.$mergedTickets.'
    '; + $output = sprintf($hesklang['x_merged'], $numberOfTickets); + echo '  '.$output.''; + } + echo ''; } // Print date submitted diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js index 802ad2b5..a8bc674d 100644 --- a/js/modsForHesk-javascript.js +++ b/js/modsForHesk-javascript.js @@ -19,6 +19,12 @@ var loadJquery = function() html: 'true' }); + //-- Activate HTML on-click popovers + $('[data-toggle="htmlpopover-onclick"]').popover({ + container: 'body', + html: 'true' + }); + //-- Activate jQuery's date picker $(function() { $('.datepicker').datepicker({ diff --git a/language/en/text.php b/language/en/text.php index b7e68511..5e82c7cb 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -36,6 +36,11 @@ $hesklang['language_key'] = 'Language Key'; $hesklang['language_key_description'] = 'This is the language file \'key\' that contains the text you want to display'; $hesklang['can_man_ticket_statuses'] = 'Can manage ticket statuses'; $hesklang['key_required'] = 'Keys are required for all statuses'; +$hesklang['x_merged'] = '(+%s merged)'; // %s number of tickets merged +$hesklang['merged_tickets'] = 'Merged tickets: '; +$hesklang['show_number_merged'] = 'Show number of tickets merged'; +$hesklang['show_number_merged_descr'] = 'Show number of tickets merged next to Tracking ID'; +$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket serarch screen.'; // ADDED OR MODIFIED IN Mods for HESK 2.2.1 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:) diff --git a/modsForHesk_settings.inc.php b/modsForHesk_settings.inc.php index 1ff48431..8471bd0b 100644 --- a/modsForHesk_settings.inc.php +++ b/modsForHesk_settings.inc.php @@ -40,4 +40,7 @@ $modsForHesk_settings['use_bootstrap_theme'] = 1; $modsForHesk_settings['new_kb_article_visibility'] = 0; //-- Setting for adding attachments to email messages. Either 0 for default-HESK behavior, or 1 to send as attachments -$modsForHesk_settings['attachments'] = 0; \ No newline at end of file +$modsForHesk_settings['attachments'] = 0; + +//-- Setting for showing number of merged tickets in the ticket search screen. 0 = Disable, 1 = Enable +$modsForHesk_settings['show_number_merged'] = 1; \ No newline at end of file