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

Some due date fixes and language file transfers

Browse Source
This commit is contained in:
Mike Koch 2016-04-13 21:43:23 -04:00
parent 2355d0b883
commit a4a92882b1
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/admin_ticket.php
View File

@ -671,11 +671,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div id="readonly-due-date"> <div id="readonly-due-date">
<span id="due-date"> <span id="due-date">
<?php <?php
$due_date = 'None'; $due_date = $hesklang['none'];
if ($ticket['due_date'] != null) { if ($ticket['due_date'] != null) {
$due_date = hesk_date($ticket['due_date'], false); $due_date = hesk_date($ticket['due_date'], false, true, false);
$due_date = date('Y-m-d', $due_date);
} }
echo substr($due_date, 0, 10); echo $due_date;
?></span><!--<span id="overdue"> ?></span><!--<span id="overdue">
<?php <?php
/*if ($due_date < $current_date) { /*if ($due_date < $current_date) {
@ -688,12 +689,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
<div id="editable-due-date" style="display: none"> <div id="editable-due-date" style="display: none">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control datepicker" name="due-date" value="<?php echo $due_date == 'None' ? '' : substr($due_date, 0, 10); ?>"> <input type="text" class="form-control datepicker" name="due-date" value="<?php echo $due_date == $hesklang['none'] ? '' : $due_date; ?>">
<p class="help-block">Clear for no due date</p> <p class="help-block"><?php echo $hesklang['clear_for_no_due_date']; ?></p>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="submit" class="btn btn-primary">Save</button> <button id="submit" class="btn btn-primary"><?php echo $hesklang['save']; ?></button>
<button id="cancel" class="btn btn-default">Cancel</button> <button id="cancel" class="btn btn-default"><?php echo $hesklang['cancel']; ?></button>
</div> </div>
</div> </div>
</li> </li>
@ -1506,7 +1507,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
</div> </div>
</div> </div>
<?php // BEGIN HIDDEN FIELDS FOR LANGUAGE STRINGS ?> <?php // TODO BEGIN HIDDEN FIELDS FOR LANGUAGE STRINGS ?>
<p style="display: none" id="lang-key"><?php echo $hesklang['save']; ?></p> <p style="display: none" id="lang-key"><?php echo $hesklang['save']; ?></p>
<?php <?php

3
internal-api/js/admin-ticket.js
View File

@ -5,6 +5,9 @@ $(document).ready(function() {
$dueDateButton.click(function() { $dueDateButton.click(function() {
$readonlyDueDateContainer.hide(); $readonlyDueDateContainer.hide();
$editableDueDateContainer.show(); $editableDueDateContainer.show();
if ($readonlyDueDateContainer.find('span#due-date').text().trim() == 'None') {
$editableDueDateContainer.find('input[type="text"][name="due-date"]').text('').val('');
}
}); });
$editableDueDateContainer.find('#cancel').click(function() { $editableDueDateContainer.find('#cancel').click(function() {

1
language/en/text.php
View File

@ -69,6 +69,7 @@ $hesklang['event_comments'] = 'Comments';
$hesklang['event_comments_tooltip'] = 'Additional comments about the event'; $hesklang['event_comments_tooltip'] = 'Additional comments about the event';
$hesklang['event_create_ticket'] = 'Create Ticket'; $hesklang['event_create_ticket'] = 'Create Ticket';
$hesklang['to_title_case'] = 'To'; $hesklang['to_title_case'] = 'To';
$hesklang['clear_for_no_due_date'] = 'Clear for no due date';
// ADDED OR MODIFIED IN Mods for HESK 2.5.2 // ADDED OR MODIFIED IN Mods for HESK 2.5.2
$hesklang['manage_statuses'] = 'Manage Statuses'; $hesklang['manage_statuses'] = 'Manage Statuses';