Consolidate asset modals to modals/asset removed ajax_ and _modal prefixes from file names and use new ajax-modal syntax

This commit is contained in:
johnnyq 2025-08-22 21:54:26 -04:00
parent 0b93d58a32
commit 15ba385398
32 changed files with 83 additions and 115 deletions

View File

@ -120,7 +120,7 @@ ob_start();
$asset_id = intval($row['asset_id']);
$asset_name = nullable_htmlentities($row['asset_name']);
$ip = !empty($row['interface_ip']) ? '(' . nullable_htmlentities($row['interface_ip']) . ')' : '';
echo "<li><a href='#' data-toggle='ajax-modal' data-modal-size='lg' data-ajax-url='ajax/ajax_asset_details.php' data-ajax-id='$asset_id'>$asset_name</a>$ip</li>";
echo "<li><a class='ajax-modal' href='#' data-modal-size='lg' data-modal-url='modals/asset/asset_details.php?id=$asset_id'>$asset_name</a>$ip</li>";
}
echo "</ul>";
}

View File

@ -238,10 +238,8 @@ if (isset($_GET['asset_id'])) {
<div class="card">
<div class="card-header">
<button type="button" class="btn btn-light float-right"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_edit.php"
data-ajax-id="<?= $asset_id; ?>">
<button type="button" class="btn btn-light float-right ajax-modal"
data-modal-url="modals/asset/asset_edit.php?id=<?= $asset_id ?>">
<i class="fas fa-fw fa-edit"></i>
</button>
<h4 class="text-bold"><i class="fa fa-fw text-secondary fa-<?= $device_icon; ?> mr-3"></i><?= $asset_name; ?></h4>
@ -382,38 +380,28 @@ if (isset($_GET['asset_id'])) {
<div class="dropdown dropleft">
<button type="button" class="btn btn-outline-primary" data-toggle="dropdown"><i class="fas fa-link mr-2"></i>Link</button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_link_software.php"
data-ajax-id="<?= $asset_id; ?>">
<a class="dropdown-item text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_link_software.php?id=<?= $asset_id ?>">
<i class="fa fa-fw fa-cube mr-2"></i>License
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_link_credential.php"
data-ajax-id="<?= $asset_id; ?>">
<a class="dropdown-item text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_link_credential.php?id=<?= $asset_id ?>">
<i class="fa fa-fw fa-key mr-2"></i>Credential
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_link_service.php"
data-ajax-id="<?= $asset_id; ?>">
<a class="dropdown-item text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_link_service.php?id=<?= $asset_id ?>">
<i class="fa fa-fw fa-stream mr-2"></i>Service
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_link_document.php"
data-ajax-id="<?= $asset_id; ?>">
<a class="dropdown-item text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_link_document.php?id=<?= $asset_id ?>">
<i class="fa fa-fw fa-folder mr-2"></i>Document
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_link_file.php"
data-ajax-id="<?= $asset_id; ?>">
<a class="dropdown-item text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_link_file.php?id=<?= $asset_id ?>">
<i class="fa fa-fw fa-paperclip mr-2"></i>File
</a>
</div>
@ -525,11 +513,9 @@ if (isset($_GET['asset_id'])) {
// Show either "-" or "AssetName - Port"
if ($connected_asset_name) {
$connected_to_display = "<a href='#'
data-toggle='ajax-modal'
$connected_to_display = "<a class='ajax-modal' href='#'
data-modal-size='lg'
data-ajax-url='ajax/ajax_asset_details.php'
data-ajax-id='$connected_asset_id'>
data-modal-url='modals/asset/asset_details.php?id=$connected_asset_id'>
<strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name
</a>";
} else {
@ -544,11 +530,9 @@ if (isset($_GET['asset_id'])) {
</td>
<td>
<i class="fa fa-fw fa-ethernet text-secondary mr-1"></i>
<a class="text-dark" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_interface_edit.php"
data-ajax-id="<?= $interface_id; ?>">
<?= $interface_name; ?> <?php if($interface_primary) { echo "<small class='text-primary'>(Primary)</small>"; } ?>
<a class="text-dark ajax-modal" href="#"
data-modal-url="modals/asset/asset_interface_edit.php?id=<?= $interface_id ?>">
<?= $interface_name ?> <?php if($interface_primary) { echo "<small class='text-primary'>(Primary)</small>"; } ?>
</a>
</td>
<td><?= $interface_type_display; ?></td>
@ -562,10 +546,8 @@ if (isset($_GET['asset_id'])) {
<i class="fas fa-ellipsis-h"></i>
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_interface_edit.php"
data-ajax-id="<?= $interface_id; ?>">
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/asset/asset_interface_edit.php?id=<?= $interface_id ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<?php if ($session_user_role == 3 && $interface_primary == 0): ?>
@ -582,8 +564,8 @@ if (isset($_GET['asset_id'])) {
</tbody>
</table>
</div>
<?php require_once "modals/asset_interface_bulk_edit_type_modal.php"; ?>
<?php require_once "modals/asset_interface_bulk_edit_network_modal.php"; ?>
<?php require_once "modals/asset/asset_interface_bulk_edit_type.php"; ?>
<?php require_once "modals/asset/asset_interface_bulk_edit_network.php"; ?>
</form>
</div>
</div>
@ -1251,10 +1233,10 @@ if (isset($_GET['asset_id'])) {
<?php
require_once "modals/asset_interface_add_modal.php";
require_once "modals/asset_interface_multiple_add_modal.php";
require_once "modals/asset_interface_import_modal.php";
require_once "modals/asset_interface_export_modal.php";
require_once "modals/asset/asset_interface_add.php";
require_once "modals/asset/asset_interface_multiple_add.php";
require_once "modals/asset/asset_interface_import.php";
require_once "modals/asset/asset_interface_export.php";
require_once "modals/ticket_add_modal.php";
require_once "modals/recurring_ticket_add_modal.php";
require_once "modals/credential_add_modal.php";

View File

@ -660,10 +660,10 @@ if (mysqli_num_rows($os_sql) > 0) {
<div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
<div class="dropdown-menu">
<a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_asset_edit.php?id=<?= $asset_id ?>">
<a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/asset/asset_edit.php?id=<?= $asset_id ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_asset_copy.php?id=<?= $asset_id ?>">
<a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/asset/asset_copy.php?id=<?= $asset_id ?>">
<i class="fas fa-fw fa-copy mr-2"></i>Copy
</a>
<?php if ($session_user_role > 2) { ?>
@ -698,14 +698,14 @@ if (mysqli_num_rows($os_sql) > 0) {
</div>
<?php
if ($client_url) {
require_once "modals/asset_bulk_assign_contact_modal.php";
require_once "modals/asset_bulk_assign_location_modal.php";
require_once "modals/asset/asset_bulk_assign_contact.php";
require_once "modals/asset/asset_bulk_assign_location.php";
}
?>
<?php require_once "modals/asset_bulk_assign_physical_location_modal.php"; ?>
<?php require_once "modals/asset_bulk_transfer_client_modal.php"; ?>
<?php require_once "modals/asset_bulk_edit_status_modal.php"; ?>
<?php require_once "modals/asset_bulk_add_ticket_modal.php"; ?>
<?php require_once "modals/asset/asset_bulk_assign_physical_location.php"; ?>
<?php require_once "modals/asset/asset_bulk_transfer_client.php"; ?>
<?php require_once "modals/asset/asset_bulk_edit_status.php"; ?>
<?php require_once "modals/asset/asset_bulk_add_ticket.php"; ?>
</form>
<?php require_once "../includes/filter_footer.php"; ?>
</div>
@ -730,9 +730,9 @@ if (mysqli_num_rows($os_sql) > 0) {
</script>
<?php
require_once "modals/asset_add_modal.php";
require_once "modals/asset_export_modal.php";
require_once "modals/asset/asset_add.php";
require_once "modals/asset/asset_export.php";
if ($client_url) {
require_once "modals/asset_import_modal.php";
require_once "modals/asset/asset_import.php";
}
require_once "../includes/footer.php";

View File

@ -272,12 +272,11 @@ $page_title = $row['document_name'];
?>
<div class="ml-2">
<a href="#"
data-toggle="ajax-modal"
<a class="ajax-modal" href="#"
data-modal-size="lg"
data-ajax-url="ajax/ajax_asset_details.php"
data-ajax-id="<?php echo $asset_id; ?>">
<?php echo $asset_name; ?></a>
data-modal-url="modals/asset/asset_details.php?id=<?= $asset_id ?>">
<?php echo $asset_name; ?>
</a>
<a class="confirm-link float-right" href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
<i class="fas fa-fw fa-trash-alt text-secondary"></i>
</a>

View File

@ -342,8 +342,9 @@ if (isset($_GET['contact_id'])) {
<div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-desktop mr-2"></i>Related Assets</h3>
<div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="ajax-modal" data-ajax-url="ajax/ajax_contact_link_asset.php" data-ajax-id="<?php echo $contact_id; ?>">
<i class="fas fa-link mr-2"></i>Link Document
<button type="button" class="btn btn-primary ajax-modal"
data-modal-url="ajax/ajax_contact_link_asset.php?id=<?= $contact_id ?>">
<i class="fas fa-link mr-2"></i>Link Asset
</button>
</div>
</div>
@ -413,11 +414,9 @@ if (isset($_GET['contact_id'])) {
<tr>
<th>
<i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
<a class="text-secondary" href="#"
data-toggle="ajax-modal"
<a class="text-secondary ajax-modal" href="#"
data-modal-size="lg"
data-ajax-url="ajax/ajax_asset_details.php"
data-ajax-id="<?php echo $asset_id; ?>">
data-modal-url="modals/asset/asset_details.php?id=<?= $asset_id ?>">
<?php echo $asset_name; ?>
</a>
<div class="mt-0">
@ -439,16 +438,12 @@ if (isset($_GET['contact_id'])) {
<div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_edit.php"
data-ajax-id="<?php echo $asset_id; ?>">
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/asset/asset_edit.php?id=<?= $asset_id ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_asset_copy.php"
data-ajax-id="<?php echo $asset_id; ?>">
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/asset/asset_copy.php?id=<?= $asset_id ?>">
<i class="fas fa-fw fa-copy mr-2"></i>Copy
</a>
<div class="dropdown-divider"></div>
@ -1212,7 +1207,7 @@ if (isset($_GET['contact_id'])) {
require_once "modals/ticket_add_modal.php";
require_once "modals/recurring_ticket_add_modal.php";
require_once "modals/asset_add_modal.php";
require_once "modals/asset/asset_add.php";
require_once "modals/credential_add_modal.php";
require_once "modals/client_document_add_modal.php";
require_once "modals/client_file_upload_modal.php";

View File

@ -391,7 +391,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
// Counts
// Asset Count
$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"));
$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL"));
$asset_count = $row['num'];
if ($asset_count) {
$asset_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#assets' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
@ -400,7 +400,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
}
// Credential Count
$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL"));
$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL"));
$credential_count = $row['num'];
if ($credential_count) {
$credential_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#credentials' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -443,4 +443,4 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -412,12 +412,9 @@ ob_start();
// Show either "-" or "AssetName - Port"
if ($connected_asset_name) {
$connected_to_display =
"<a href='#' data-toggle='ajax-modal'
data-modal-size='lg'
data-ajax-url='ajax/ajax_asset_details.php'
data-ajax-id='$connected_asset_id'>
<strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name
$connected_to_display = "<a class='ajax-modal' href='#' data-modal-size='lg'
data-modal-url='modals/asset/asset_details.php?id=$connected_asset_id'>
<strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name
</a>
";
} else {
@ -858,13 +855,14 @@ ob_start();
</div>
<div class="modal-footer">
<a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="btn btn-primary text-bold"><span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span></a>
<a href="#" class="btn btn-secondary"
data-toggle="ajax-modal" data-ajax-url="ajax/ajax_asset_edit.php" data-ajax-id="<?php echo $asset_id; ?>">
<a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>"
class="btn btn-primary text-bold"><span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span>
</a>
<a href="#" class="btn btn-secondary ajax-modal" data-modal-url="modals/asset/asset_edit.php?id=<?= $asset_id ?>">
<span class="text-white"><i class="fas fa-edit mr-2"></i>Edit</span>
</a>
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
</div>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -493,4 +493,4 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$interface_id = intval($_GET['id']);
@ -330,4 +330,4 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -65,5 +65,5 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';
?>

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -66,5 +66,5 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';
?>

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -69,5 +69,5 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';
?>

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -65,4 +65,4 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$asset_id = intval($_GET['id']);
@ -70,4 +70,4 @@ ob_start();
</form>
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';

View File

@ -55,7 +55,7 @@
?>
<div class="ml-2">
<a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
<a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
<a class="confirm-link float-right" href="post.php?unlink_asset_from_file&asset_id=<?php echo $asset_id; ?>&file_id=<?php echo $file_id; ?>">
<i class="fas fa-fw fa-trash-alt text-secondary"></i>
</a>

View File

@ -1156,11 +1156,8 @@ if (isset($_GET['ticket_id'])) {
</div>
<div class="card-body">
<div>
<a href="#"
data-toggle="ajax-modal"
data-modal-size="lg"
data-ajax-url="ajax/ajax_asset_details.php?<?php echo $client_url; ?>"
data-ajax-id="<?php echo $asset_id; ?>">
<a class="ajax-modal" href="#" data-modal-size="lg"
data-modal-url="modals/asset/asset_details.php?<?= $client_url ?>&id=<?= $asset_id ?>">
<i class="fa fa-fw fa-<?php echo $asset_icon; ?> text-secondary mr-2"></i><strong><?php echo $asset_name; ?></strong>
</a>
</div>
@ -1172,11 +1169,8 @@ if (isset($_GET['ticket_id'])) {
$additional_asset_icon = getAssetIcon($additional_asset_type);
?>
<div class="mt-1">
<a href="#"
data-toggle="ajax-modal"
data-modal-size="lg"
data-ajax-url="ajax/ajax_asset_details.php?<?php echo $client_url; ?>"
data-ajax-id="<?php echo $additional_asset_id; ?>">
<a class="ajax-modal" href="#" data-modal-size="lg"
data-modal-url="modals/asset/asset_details.php?<?= $client_url ?>&id=<?= $additional_asset_id ?>">
<i class="fa fa-fw fa-<?php echo $additional_asset_icon; ?> text-secondary mr-2"></i><?php echo $additional_asset_name; ?>
</a>
<?php if (empty($ticket_closed_at)) { ?>