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

Merge branch '503-align-message-to-custom-fields' into '3-0-4'

Browse Source 
#503 tweak message format, also fix some missing changes for the calendar fix

See merge request !47
This commit is contained in:
Mike Koch 2017-03-28 01:53:30 +00:00
commit 48f5ad1810
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
admin/admin_ticket.php
View File

@ -1610,15 +1610,22 @@ function mfh_print_message() {
?> ?>
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<?php <div class="row">
if ($ticket['message'] != '') { <div class="col-md-3 text-right">
if ($ticket['html']) { <strong><?php echo $hesklang['message_colon']; ?></strong>
echo hesk_html_entity_decode($ticket['message']); </div>
} else { <div class="col-md-9">
echo $ticket['message']; <?php
} if ($ticket['message'] != '') {
} if ($ticket['html']) {
?> echo hesk_html_entity_decode($ticket['message']);
} else {
echo $ticket['message'];
}
}
?>
</div>
</div>
</div> </div>
<?php <?php
$first = true; $first = true;
@ -1714,12 +1721,19 @@ function hesk_printTicketReplies()
<span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span> <span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span>
<h3 class="timeline-header"><?php echo $reply['name']; ?></h3> <h3 class="timeline-header"><?php echo $reply['name']; ?></h3>
<div class="timeline-body"> <div class="timeline-body">
<?php <div class="row">
if ($reply['html']) { <div class="col-md-3 text-right">
echo hesk_html_entity_decode($reply['message']); <strong><?php echo $hesklang['message_colon']; ?></strong>
} else { </div>
echo $reply['message']; <div class="col-md-9">
} ?> <?php
if ($reply['html']) {
echo hesk_html_entity_decode($reply['message']);
} else {
echo $reply['message'];
} ?>
</div>
</div>
</div> </div>
<?php <?php
if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])): if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])):

1
js/calendar/mods-for-hesk-calendar-admin-readonly.js
View File

@ -22,6 +22,7 @@ $(document).ready(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}); });
callback(events); callback(events);
updateCategoryVisibility();
}, },
error: function(data) { error: function(data) {
console.error(data); console.error(data);

1
js/calendar/mods-for-hesk-calendar-readonly.js
View File

@ -22,6 +22,7 @@ $(document).ready(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}); });
callback(events); callback(events);
updateCategoryVisibility();
}, },
error: function(data) { error: function(data) {
console.error(data); console.error(data);