Closes #68: Notes can be edited
This commit is contained in:
Mike Koch
parent
26cfe83953
commit
e84d9f3229
@ -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');
|
||||
{
|
||||
?>
|
||||
<div class="row">
|
||||
<div class="col-md-12 alert-warning">
|
||||
<?php if ($can_del_notes || $note['who'] == $_SESSION['id']) { ?><p><a href="admin_ticket.php?track=<?php echo $trackingID; ?>&Refresh=<?php echo mt_rand(10000,99999); ?>&delnote=<?php echo $note['id']; ?>&token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['delnote']).'?'; ?>');"><i class="fa fa-times"></i> Delete Note</a></p><?php }?>
|
||||
<div class="col-md-12 alert-warning" style="padding-top: 5px;">
|
||||
<?php if ($can_del_notes || $note['who'] == $_SESSION['id']) { ?>
|
||||
<div class="btn-group btn-group-sm float-right-sm" role="group" style="padding-top: 5px; padding-bottom: 5px;">
|
||||
<a class="btn btn-danger"
|
||||
href="admin_ticket.php?track=<?php echo $trackingID; ?>&Refresh=<?php echo mt_rand(10000,99999); ?>&delnote=<?php echo $note['id']; ?>&token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['delnote']).'?'; ?>');">
|
||||
<i class="fa fa-times"></i> <?php echo $hesklang['delete']; ?>
|
||||
</a>
|
||||
<a class="btn btn-warning"
|
||||
href="javascript:void(0)" onclick="toggleNote(<?php echo $note['id']; ?>, true)">
|
||||
<i class="fa fa-pencil"></i> <?php echo $hesklang['edit']; ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php }?>
|
||||
<p><i><?php echo $hesklang['noteby']; ?> <b><?php echo ($note['name'] ? $note['name'] : $hesklang['e_udel']); ?></b></i> - <?php echo hesk_date($note['dt']); ?></p>
|
||||
<p><?php echo $note['message']; ?></p>
|
||||
<p id="note-<?php echo $note['id']; ?>-p"><?php echo $note['message']; ?></p>
|
||||
<form style="display: none" id="note-<?php echo $note['id']; ?>-form" role="form" method="post"
|
||||
action="admin_ticket.php?track=<?php echo $trackingID; ?>&Refresh=<?php echo mt_rand(10000,99999); ?>&token=<?php hesk_token_echo(); ?>">
|
||||
<textarea style="margin-bottom: 5px;" class="form-control" id="note-<?php echo $note['id']; ?>-textarea" name="note_message"><?php echo $note['message']; ?></textarea>
|
||||
<input type="hidden" name="note_id" value="<?php echo $note['id']; ?>">
|
||||
<button style="margin-bottom: 5px;" class="btn btn-success btn-sm" type="submit"><i class="fa fa-check"></i> <?php echo $hesklang['save']; ?></button>
|
||||
<a style="margin-bottom: 5px;" class="btn btn-danger btn-sm" href="javascript:void(0)" onclick="toggleNote(<?php echo $note['id']; ?>, false)">
|
||||
<i class="fa fa-times"></i> <?php echo $hesklang['cancel']; ?>
|
||||
</a>
|
||||
</form>
|
||||
<?php if ($note['number_of_edits'] > 0) { ?>
|
||||
<p><i><?php echo sprintf($hesklang['note_last_edit'], hesk_date($note['edit_date'])); echo ' | '.sprintf($hesklang['total_number_of_edits'], $note['number_of_edits']); ?></i></p>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
|
||||
@ -358,3 +358,9 @@ div.setupButtons {
|
||||
margin-right: auto;
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.float-right-sm {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
@ -356,4 +356,10 @@ div.setupButtons {
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.float-right-sm {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
@ -6,6 +6,8 @@ require(HESK_PATH . 'hesk_settings.inc.php');
|
||||
hesk_dbConnect();
|
||||
hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` ADD COLUMN `notify_note_unassigned` ENUM('0', '1') NOT NULL DEFAULT '0'");
|
||||
hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` ADD COLUMN `can_change_notification_settings` ENUM('0', '1') NOT NULL DEFAULT '1'");
|
||||
hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` ADD COLUMN `edit_date` DATETIME NULL");
|
||||
hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` ADD COLUMN `number_of_edits` INT NOT NULL DEFAULT 0");
|
||||
?>
|
||||
|
||||
<h1>Installation / Update complete!</h1>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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:';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user