AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-19 04:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert to old ajax-modal js code for now, Fix Assets not lising in create ticket.

Browse Source
This commit is contained in:
johnnyq
2026-02-11 13:33:28 -05:00
parent bdf8038148
commit 1d06e6d9c8
2 changed files with 56 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/ajax.php
View File

@@ -319,7 +319,7 @@ if (isset($_GET['get_client_assets'])) {
LEFT JOIN contacts ON contact_id = asset_contact_id LEFT JOIN contacts ON contact_id = asset_contact_id
WHERE assets.asset_archived_at IS NULL AND asset_client_id = $client_id WHERE assets.asset_archived_at IS NULL AND asset_client_id = $client_id
$access_permission_query $access_permission_query
ORDER BY asset_important DESC, asset_name" ORDER BY asset_favorite DESC, asset_name"
); );
while ($row = mysqli_fetch_assoc($asset_sql)) { while ($row = mysqli_fetch_assoc($asset_sql)) {

163
js/ajax_modal.js
View File

@@ -1,114 +1,61 @@
// Ajax Modal Load Script (deduped + locked) // Ajax Modal Load Script
function hashKey(str) {
let h = 0;
for (let i = 0; i < str.length; i++) {
h = ((h << 5) - h + str.charCodeAt(i)) | 0;
}
return Math.abs(h).toString(36);
}
$(document).on('click', '.ajax-modal', function (e) { $(document).on('click', '.ajax-modal', function (e) {
e.preventDefault(); e.preventDefault();
const $trigger = $(this); const $trigger = $(this);
// prevent spam clicks on same trigger // Prefer data-modal-url, fallback to href
if ($trigger.data('ajaxModalLoading')) { let modalUrl = $trigger.data('modal-url') || $trigger.attr('href') || '#';
const modalSize = $trigger.data('modal-size') || 'md';
const modalId = 'ajaxModal_' + Date.now();
// If no usable URL, bail
if (!modalUrl || modalUrl === '#') {
console.warn('ajax-modal: No modal URL found on trigger:', this);
return;
}
// Show loading spinner while fetching content
const loadingSpinner = `
<div id="modal-loading-spinner" class="text-center p-5">
<i class="fas fa-spinner fa-spin fa-2x text-muted"></i>
</div>`;
$('.content-wrapper').append(loadingSpinner);
// Make AJAX request
$.ajax({
url: modalUrl,
method: 'GET',
dataType: 'json',
success: function (response) {
$('#modal-loading-spinner').remove();
if (response.error) {
alert(response.error);
return; return;
}
const modalHtml = `
<div class="modal fade" id="${modalId}" tabindex="-1">
<div class="modal-dialog modal-${modalSize}">
<div class="modal-content border-dark">
${response.content}
</div>
</div>
</div>`;
$('.content-wrapper').append(modalHtml);
const $modal = $('#' + modalId);
$modal.modal('show');
$modal.on('hidden.bs.modal', function () {
$(this).remove();
});
},
error: function (xhr, status, error) {
$('#modal-loading-spinner').remove();
alert('Error loading modal content. Please try again.');
console.error('Modal AJAX Error:', status, error);
} }
});
$trigger
.data('ajaxModalLoading', true)
.prop('disabled', true)
.addClass('disabled');
// Prefer data-modal-url, fallback to href
const modalUrl = $trigger.data('modal-url') || $trigger.attr('href') || '#';
const modalSize = $trigger.data('modal-size') || 'md';
if (!modalUrl || modalUrl === '#') {
console.warn('ajax-modal: No modal URL found on trigger:', this);
$trigger
.data('ajaxModalLoading', false)
.prop('disabled', false)
.removeClass('disabled');
return;
}
// stable IDs based on URL (prevents duplicates)
const key = hashKey(String(modalUrl));
const modalId = 'ajaxModal_' + key;
const spinnerId = 'modal-loading-spinner-' + key;
// if modal already exists, just show it
const $existing = $('#' + modalId);
if ($existing.length) {
$existing.modal('show');
$trigger
.data('ajaxModalLoading', false)
.prop('disabled', false)
.removeClass('disabled');
return;
}
// Show loading spinner while fetching content (deduped)
$('#' + spinnerId).remove();
$('.content-wrapper').append(`
<div id="${spinnerId}" class="text-center p-5">
<i class="fas fa-spinner fa-spin fa-2x text-muted"></i>
</div>
`);
$.ajax({
url: modalUrl,
method: 'GET',
dataType: 'json'
})
.done(function (response) {
$('#' + spinnerId).remove();
if (response && response.error) {
alert(response.error);
return;
}
// guard against race: if another request already created it
if ($('#' + modalId).length) {
$('#' + modalId).modal('show');
return;
}
const modalHtml = `
<div class="modal fade" id="${modalId}" tabindex="-1">
<div class="modal-dialog modal-${modalSize}">
<div class="modal-content border-dark">
${response.content || ''}
</div>
</div>
</div>`;
$('.content-wrapper').append(modalHtml);
const $modal = $('#' + modalId);
$modal.modal('show');
$modal.on('hidden.bs.modal', function () {
$(this).remove();
});
})
.fail(function (xhr, status, error) {
$('#' + spinnerId).remove();
alert('Error loading modal content. Please try again.');
console.error('Modal AJAX Error:', status, error);
})
.always(function () {
$trigger
.data('ajaxModalLoading', false)
.prop('disabled', false)
.removeClass('disabled');
});
}); });