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

Reset color options on modal after saving

Browse Source
This commit is contained in:
Mike Koch 2018-05-18 20:33:29 -04:00
parent 0bb182220a
commit 0c04660f3f
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/manage_categories.php
View File

@ -477,6 +477,7 @@ echo mfh_get_hidden_fields_for_language(array(
'geco', 'geco',
'cpric', 'cpric',
'no_manager', 'no_manager',
'e_udel',
)); ));
require_once(HESK_PATH . 'inc/footer.inc.php'); require_once(HESK_PATH . 'inc/footer.inc.php');

26
internal-api/js/manage-categories.js
View File

@ -122,7 +122,8 @@ function loadTable() {
if (this.manager === null) { if (this.manager === null) {
$template.find('[data-property="manager"]').text(mfhLang.text('no_manager')); $template.find('[data-property="manager"]').text(mfhLang.text('no_manager'));
} else { } else {
$template.find('[data-property="manager"]').text(users[this.manager].name); var managerName = users[this.manager] === undefined ? mfhLang.text('e_udel') : users[this.manager].name;
$template.find('[data-property="manager"]').text(managerName);
} }
if (this.id === 1) { if (this.id === 1) {
@ -190,7 +191,7 @@ function bindEditModal() {
colorpickerOptions = { colorpickerOptions = {
format: 'hex' format: 'hex'
}; };
if (foregroundColor != '' && foregroundColor !== 'AUTO') { if (foregroundColor !== '' && foregroundColor !== 'AUTO') {
colorpickerOptions.color = foregroundColor; colorpickerOptions.color = foregroundColor;
} }
@ -246,16 +247,18 @@ function bindCreateModal() {
} }
function bindModalCancelCallback() { function bindModalCancelCallback() {
$('.cancel-callback').click(function() { $('.cancel-callback').click(resetModal);
var $editCategoryModal = $('#category-modal'); }
$editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end(); function resetModal() {
$editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end(); var $editCategoryModal = $('#category-modal');
$editCategoryModal.find('input[name="display-border"][value="1"]').prop('checked');
$editCategoryModal.find('input[name="display-border"][value="0"]').prop('checked'); $editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end();
$editCategoryModal.find('input[name="autoassign"][value="1"]').prop('checked'); $editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end();
$editCategoryModal.find('input[name="autoassign"][value="0"]').prop('checked'); $editCategoryModal.find('input[name="display-border"][value="1"]').prop('checked');
}); $editCategoryModal.find('input[name="display-border"][value="0"]').prop('checked');
$editCategoryModal.find('input[name="autoassign"][value="1"]').prop('checked');
$editCategoryModal.find('input[name="autoassign"][value="0"]').prop('checked');
} }
function bindFormSubmit() { function bindFormSubmit() {
@ -310,6 +313,7 @@ function bindFormSubmit() {
format = mfhLang.html('category_updated'); format = mfhLang.html('category_updated');
mfhAlert.success(format.replace('%s', data.name)); mfhAlert.success(format.replace('%s', data.name));
} }
resetModal();
$modal.modal('hide'); $modal.modal('hide');
loadTable(); loadTable();
}, },