From e84d9f32298d9e43fa437ffbba48ff7d7d9c359c Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 27 Nov 2014 01:19:30 -0500 Subject: [PATCH] Closes #68: Notes can be edited --- admin/admin_ticket.php | 47 ++++++++++++++++++++++++++++++++++++--- css/hesk_newStyle.php | 6 +++++ css/hesk_newStyleRTL.php | 6 +++++ install/updateTo1-6-0.php | 2 ++ js/nuMods-javascript.js | 11 +++++++++ language/en/text.php | 3 +++ 6 files changed, 72 insertions(+), 3 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 35b752ec..381bb0d1 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -401,6 +401,24 @@ if (isset($_GET['delatt']) && hesk_token_check()) hesk_process_messages($hesklang['kb_att_rem'],'admin_ticket.php?track='.$trackingID.'&Refresh='.mt_rand(10000,99999),'SUCCESS'); } +if (isset($_POST['note_message'])) { + $n = $_POST['note_id']; + if ($can_del_notes) + { + hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` + SET `edit_date` = NOW(), `message` = '".hesk_dbEscape($_POST['note_message'])."', `number_of_edits` = `number_of_edits` + 1 + WHERE `id`='".intval($n)."' LIMIT 1"); + } + else + { + hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` + SET `edit_date` = NOW(), `message` = '".hesk_dbEscape($_POST['note_message'])."', `number_of_edits` = `number_of_edits` + 1 + WHERE `id`='".intval($n)."' AND `who`='".intval($_SESSION['id'])."' LIMIT 1"); + } + hesk_process_messages($hesklang['note_edit_successful'],'admin_ticket.php?track='.$trackingID.'&Refresh='.mt_rand(10000,99999),'SUCCESS'); +} + + /* Print header */ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); @@ -814,10 +832,33 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); { ?>
-
-

Delete Note

+
+ +
+ + +   + + + +
+

-

-

+

+ + 0) { ?> +

+

Installation / Update complete!

diff --git a/js/nuMods-javascript.js b/js/nuMods-javascript.js index 2ac14462..f8100465 100644 --- a/js/nuMods-javascript.js +++ b/js/nuMods-javascript.js @@ -50,4 +50,15 @@ function toggleChildrenForm(show) { } } +function toggleNote(noteId, showForm) { + if (showForm) { + $('#note-' + noteId + '-p').hide(); + $('#note-' + noteId + '-form').show(); + } else { + $('#note-' + noteId + '-p').show(); + $('#note-' + noteId + '-form').hide(); + $('#note-' + noteId + '-textarea').val($('#note-' + noteId + '-p').text()) + } +} + jQuery(document).ready(loadJquery); diff --git a/language/en/text.php b/language/en/text.php index a2f57699..cf3b6aca 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -28,6 +28,9 @@ $hesklang['ticket_reopen_assigned'] = '[#%%TRACK_ID%%] Assigned ticket reopened' $hesklang['create_based_on_contact'] = 'Create Ticket For Same Contact'; $hesklang['notify_note_unassigned'] = 'Someone adds a note to a ticket not assigned to me'; $hesklang['can_change_notification_settings'] = 'Can change notification settings'; +$hesklang['note_edit_successful'] = 'Note edited'; +$hesklang['note_last_edit'] = 'Note last edited on: %s'; // %s: timestamp of last edit +$hesklang['total_number_of_edits'] = 'Total number of edits: %s'; // %s: total number of edits // ADDED OR MODIFIED IN NuMods 1.5.0 $hesklang['ticket_auto_refresh'] = 'Ticket Table Auto-Refresh:';