From 451206525e8828a2040f6503fbcbf4fa54a5fc55 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 25 Aug 2025 00:07:51 -0400 Subject: [PATCH] Remove function code for old way ajax-modal, moved modals over to modal_header/footer and removed _new --- admin/modals/ai/ai_model_edit.php | 4 +- admin/modals/ai/ai_provider_edit.php | 4 +- admin/modals/category/category_edit.php | 4 +- admin/modals/custom_link/custom_link_edit.php | 4 +- .../document_template_edit.php | 4 +- .../mail_queue/mail_queue_message_view.php | 4 +- .../payment_method/payment_method_edit.php | 4 +- .../payment_provider_edit.php | 4 +- admin/modals/role/role_edit.php | 4 +- .../software_template_edit.php | 4 +- admin/modals/tag/tag_edit.php | 4 +- admin/modals/tax/tax_edit.php | 4 +- .../ticket_status/ticket_status_edit.php | 4 +- .../ticket_template_task_edit.php | 4 +- admin/modals/user/user_edit.php | 2 +- .../vendor_template/vendor_template_edit.php | 4 +- includes/modal_footer.php | 4 +- includes/modal_footer_new.php | 10 --- includes/modal_header.php | 6 +- includes/modal_header_new.php | 13 ---- js/ajax_modal.js | 63 +------------------ user/modals/account/account_edit.php | 4 +- user/modals/asset/asset_copy.php | 4 +- user/modals/asset/asset_details.php | 4 +- user/modals/asset/asset_edit.php | 4 +- user/modals/asset/asset_interface_edit.php | 4 +- user/modals/asset/asset_link_credential.php | 4 +- user/modals/asset/asset_link_document.php | 4 +- user/modals/asset/asset_link_file.php | 4 +- user/modals/asset/asset_link_service.php | 4 +- user/modals/asset/asset_link_software.php | 4 +- user/modals/calendar/calendar_edit.php | 4 +- user/modals/calendar/calendar_event_edit.php | 4 +- user/modals/certificate/certificate_edit.php | 4 +- user/modals/client/client_edit.php | 4 +- user/modals/contact/contact_details.php | 4 +- user/modals/contact/contact_edit.php | 4 +- user/modals/contact/contact_link_asset.php | 4 +- .../contact/contact_link_credential.php | 4 +- user/modals/contact/contact_link_document.php | 4 +- user/modals/contact/contact_link_file.php | 4 +- user/modals/contact/contact_link_service.php | 4 +- user/modals/contact/contact_link_software.php | 4 +- user/modals/contact/contact_note_add.php | 4 +- user/modals/credential/credential_edit.php | 4 +- user/modals/credential/credential_view.php | 4 +- user/modals/document/document_edit.php | 4 +- user/modals/document/document_move.php | 4 +- user/modals/document/document_rename.php | 4 +- .../modals/document/document_version_view.php | 4 +- user/modals/document/document_view.php | 4 +- user/modals/domain/domain_edit.php | 4 +- user/modals/expense/expense_copy.php | 4 +- user/modals/expense/expense_edit.php | 4 +- user/modals/expense/expense_refund.php | 4 +- user/modals/file/file_move.php | 4 +- user/modals/file/file_rename.php | 2 +- user/modals/folder/folder_rename.php | 4 +- user/modals/invoice/invoice_apply_credit.php | 4 +- user/modals/invoice/invoice_copy.php | 4 +- user/modals/invoice/invoice_edit.php | 4 +- user/modals/invoice/invoice_pay.php | 4 +- user/modals/invoice/item_edit.php | 4 +- user/modals/location/location_edit.php | 4 +- user/modals/network/network_edit.php | 4 +- user/modals/product/product_edit.php | 4 +- user/modals/product/product_stock_add.php | 4 +- user/modals/project/project_edit.php | 4 +- user/modals/quote/quote_copy.php | 4 +- user/modals/quote/quote_edit.php | 4 +- user/modals/rack/rack_device_add.php | 4 +- user/modals/rack/rack_edit.php | 4 +- .../recurring_expense_edit.php | 4 +- .../recurring_invoice_edit.php | 4 +- .../recurring_ticket_edit.php | 4 +- user/modals/revenue/revenue_edit.php | 4 +- user/modals/service/service_details.php | 4 +- user/modals/service/service_edit.php | 4 +- user/modals/software/software_edit.php | 4 +- user/modals/ticket/ticket_assign.php | 4 +- user/modals/ticket/ticket_billable.php | 4 +- user/modals/ticket/ticket_contact.php | 4 +- user/modals/ticket/ticket_edit.php | 4 +- user/modals/ticket/ticket_priority.php | 4 +- user/modals/ticket/ticket_reply_edit.php | 4 +- user/modals/ticket/ticket_reply_redact.php | 4 +- user/modals/ticket/ticket_task_edit.php | 4 +- user/modals/transfer/transfer_edit.php | 4 +- user/modals/trip/trip_copy.php | 4 +- user/modals/trip/trip_edit.php | 4 +- user/modals/vendor/vendor_details.php | 4 +- user/modals/vendor/vendor_edit.php | 4 +- 92 files changed, 180 insertions(+), 260 deletions(-) delete mode 100644 includes/modal_footer_new.php delete mode 100644 includes/modal_header_new.php diff --git a/admin/modals/ai/ai_model_edit.php b/admin/modals/ai/ai_model_edit.php index 79db1219..87c5bbc2 100644 --- a/admin/modals/ai/ai_model_edit.php +++ b/admin/modals/ai/ai_model_edit.php @@ -1,6 +1,6 @@ Tell your admin: Your role does not have admin access."); @@ -76,4 +76,4 @@ ob_start(); - + + - - - $content]); - exit(); -?> \ No newline at end of file diff --git a/includes/modal_header.php b/includes/modal_header.php index 74f3848c..695f098a 100644 --- a/includes/modal_header.php +++ b/includes/modal_header.php @@ -1,8 +1,8 @@ 'ID missing.']); -// exit; -//} diff --git a/js/ajax_modal.js b/js/ajax_modal.js index 5a70dd93..a4d1b2a1 100644 --- a/js/ajax_modal.js +++ b/js/ajax_modal.js @@ -3,16 +3,13 @@ /* Example Triggering --> */ -// New Way $(document).on('click', '.ajax-modal', function (e) { e.preventDefault(); @@ -66,58 +63,4 @@ $(document).on('click', '.ajax-modal', function (e) { console.error('Modal AJAX Error:', status, error); } }); -}); - -// OLD Way -$(document).on('click', '[data-toggle="ajax-modal"]', function (e) { - e.preventDefault(); - - // Get the URL and ID from the element's data attributes. - var $trigger = $(this); - var ajaxUrl = $trigger.data('ajax-url'); - var ajaxId = $trigger.data('ajax-id'); - var modalSize = $trigger.data('modal-size') || 'md'; - - // Make the AJAX call to fetch modal content. - $.ajax({ - url: ajaxUrl, - method: 'GET', - data: { id: ajaxId }, - dataType: 'json', - success: function (response) { - if (response.error) { - alert(response.error); - return; - } - - // Create a modal ID by appending the ajaxId. - var modalId = 'ajaxModal_' + ajaxId + '_' + new Date().getTime(); - - // Remove any existing modal with this ID. - $('#' + modalId).remove(); - - // Build the modal HTML using the returned title and content. - var modalHtml = - ''; - - // Append the modal to the body and show it. - $('.content-wrapper').append(modalHtml); - var $modal = $('#' + modalId); - $modal.modal('show'); - - // Remove the modal from the DOM once it's hidden. - $modal.on('hidden.bs.modal', function () { - $(this).remove(); - }); - }, - error: function () { - alert('Error loading modal content.'); - } - }); -}); +}); \ No newline at end of file diff --git a/user/modals/account/account_edit.php b/user/modals/account/account_edit.php index 06162efc..54e7f8f7 100644 --- a/user/modals/account/account_edit.php +++ b/user/modals/account/account_edit.php @@ -1,6 +1,6 @@ diff --git a/user/modals/asset/asset_link_document.php b/user/modals/asset/asset_link_document.php index a894a49e..d90b15ba 100644 --- a/user/modals/asset/asset_link_document.php +++ b/user/modals/asset/asset_link_document.php @@ -1,6 +1,6 @@ diff --git a/user/modals/asset/asset_link_file.php b/user/modals/asset/asset_link_file.php index 95f2e51d..31d47bc9 100644 --- a/user/modals/asset/asset_link_file.php +++ b/user/modals/asset/asset_link_file.php @@ -1,6 +1,6 @@ diff --git a/user/modals/asset/asset_link_service.php b/user/modals/asset/asset_link_service.php index fecb87f4..f569b458 100644 --- a/user/modals/asset/asset_link_service.php +++ b/user/modals/asset/asset_link_service.php @@ -1,6 +1,6 @@ diff --git a/user/modals/contact/contact_link_asset.php b/user/modals/contact/contact_link_asset.php index ca0b8807..1db6dbe8 100644 --- a/user/modals/contact/contact_link_asset.php +++ b/user/modals/contact/contact_link_asset.php @@ -1,6 +1,6 @@ diff --git a/user/modals/contact/contact_link_credential.php b/user/modals/contact/contact_link_credential.php index 20905205..a4a8a4d4 100644 --- a/user/modals/contact/contact_link_credential.php +++ b/user/modals/contact/contact_link_credential.php @@ -1,6 +1,6 @@ diff --git a/user/modals/contact/contact_link_document.php b/user/modals/contact/contact_link_document.php index e5df893a..ac5f54c7 100644 --- a/user/modals/contact/contact_link_document.php +++ b/user/modals/contact/contact_link_document.php @@ -1,6 +1,6 @@ diff --git a/user/modals/contact/contact_link_file.php b/user/modals/contact/contact_link_file.php index 3cdd4400..2cb882c2 100644 --- a/user/modals/contact/contact_link_file.php +++ b/user/modals/contact/contact_link_file.php @@ -1,6 +1,6 @@ diff --git a/user/modals/contact/contact_note_add.php b/user/modals/contact/contact_note_add.php index 72a5d4b8..1b38d210 100644 --- a/user/modals/contact/contact_note_add.php +++ b/user/modals/contact/contact_note_add.php @@ -1,6 +1,6 @@ diff --git a/user/modals/expense/expense_edit.php b/user/modals/expense/expense_edit.php index 9fa98113..059cfe66 100644 --- a/user/modals/expense/expense_edit.php +++ b/user/modals/expense/expense_edit.php @@ -1,6 +1,6 @@ diff --git a/user/modals/expense/expense_refund.php b/user/modals/expense/expense_refund.php index c1169452..e6e89c9f 100644 --- a/user/modals/expense/expense_refund.php +++ b/user/modals/expense/expense_refund.php @@ -1,6 +1,6 @@