diff --git a/user/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php index 028bbc7f..5099a9a3 100644 --- a/user/ajax/ajax_service_details.php +++ b/user/ajax/ajax_service_details.php @@ -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 "
  • $asset_name$ip
    • "; + echo "
  • $asset_name$ip
    • "; } echo ""; } diff --git a/user/asset_details.php b/user/asset_details.php index bc71edb7..1d023151 100644 --- a/user/asset_details.php +++ b/user/asset_details.php @@ -238,10 +238,8 @@ if (isset($_GET['asset_id'])) {
    -

    @@ -382,38 +380,28 @@ if (isset($_GET['asset_id'])) {
    - + License
    - + Credential
    - + Service
    - + Document
    - + File
    @@ -525,11 +513,9 @@ if (isset($_GET['asset_id'])) { // Show either "-" or "AssetName - Port" if ($connected_asset_name) { - $connected_to_display = " - - (Primary)"; } ?> + + (Primary)"; } ?> @@ -562,10 +546,8 @@ if (isset($_GET['asset_id'])) {
    - + Edit @@ -582,8 +564,8 @@ if (isset($_GET['asset_id'])) {
    - - + +
    @@ -1251,10 +1233,10 @@ if (isset($_GET['asset_id'])) { 0) {
    - + Edit - + Copy 2) { ?> @@ -698,14 +698,14 @@ if (mysqli_num_rows($os_sql) > 0) {
    - - - - + + + +
    @@ -730,9 +730,9 @@ if (mysqli_num_rows($os_sql) > 0) {
    - - + data-modal-url="modals/asset/asset_details.php?id="> + + diff --git a/user/contact_details.php b/user/contact_details.php index e1d13561..967f0e3a 100644 --- a/user/contact_details.php +++ b/user/contact_details.php @@ -342,8 +342,9 @@ if (isset($_GET['contact_id'])) {

    Related Assets

    -
    @@ -413,11 +414,9 @@ if (isset($_GET['contact_id'])) { - + data-modal-url="modals/asset/asset_details.php?id=">
    @@ -439,16 +438,12 @@ if (isset($_GET['contact_id'])) {
    - + Edit - + Copy
    @@ -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"; diff --git a/user/contacts.php b/user/contacts.php index 46bd7743..965f4927 100644 --- a/user/contacts.php +++ b/user/contacts.php @@ -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 = "$asset_count"; @@ -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 = "$credential_count"; diff --git a/user/modals/asset_add_modal.php b/user/modals/asset/asset_add.php similarity index 100% rename from user/modals/asset_add_modal.php rename to user/modals/asset/asset_add.php diff --git a/user/modals/asset_bulk_add_ticket_modal.php b/user/modals/asset/asset_bulk_add_ticket.php similarity index 100% rename from user/modals/asset_bulk_add_ticket_modal.php rename to user/modals/asset/asset_bulk_add_ticket.php diff --git a/user/modals/asset_bulk_assign_contact_modal.php b/user/modals/asset/asset_bulk_assign_contact.php similarity index 100% rename from user/modals/asset_bulk_assign_contact_modal.php rename to user/modals/asset/asset_bulk_assign_contact.php diff --git a/user/modals/asset_bulk_assign_location_modal.php b/user/modals/asset/asset_bulk_assign_location.php similarity index 100% rename from user/modals/asset_bulk_assign_location_modal.php rename to user/modals/asset/asset_bulk_assign_location.php diff --git a/user/modals/asset_bulk_assign_physical_location_modal.php b/user/modals/asset/asset_bulk_assign_physical_location.php similarity index 100% rename from user/modals/asset_bulk_assign_physical_location_modal.php rename to user/modals/asset/asset_bulk_assign_physical_location.php diff --git a/user/modals/asset_bulk_edit_status_modal.php b/user/modals/asset/asset_bulk_edit_status.php similarity index 100% rename from user/modals/asset_bulk_edit_status_modal.php rename to user/modals/asset/asset_bulk_edit_status.php diff --git a/user/modals/asset_bulk_transfer_client_modal.php b/user/modals/asset/asset_bulk_transfer_client.php similarity index 100% rename from user/modals/asset_bulk_transfer_client_modal.php rename to user/modals/asset/asset_bulk_transfer_client.php diff --git a/user/ajax/ajax_asset_copy.php b/user/modals/asset/asset_copy.php similarity index 99% rename from user/ajax/ajax_asset_copy.php rename to user/modals/asset/asset_copy.php index 8ff28cba..33f5f1ab 100644 --- a/user/ajax/ajax_asset_copy.php +++ b/user/modals/asset/asset_copy.php @@ -1,6 +1,6 @@ - $connected_asset_name - $connected_interface_name + $connected_to_display = " + $connected_asset_name - $connected_interface_name "; } else { @@ -858,13 +855,14 @@ ob_start();
    - More Details - + More Details + + Edit
    diff --git a/user/ajax/ajax_asset_link_document.php b/user/modals/asset/asset_link_document.php similarity index 96% rename from user/ajax/ajax_asset_link_document.php rename to user/modals/asset/asset_link_document.php index e74476e3..a894a49e 100644 --- a/user/ajax/ajax_asset_link_document.php +++ b/user/modals/asset/asset_link_document.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_asset_link_file.php b/user/modals/asset/asset_link_file.php similarity index 96% rename from user/ajax/ajax_asset_link_file.php rename to user/modals/asset/asset_link_file.php index 6393572c..95f2e51d 100644 --- a/user/ajax/ajax_asset_link_file.php +++ b/user/modals/asset/asset_link_file.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_asset_link_service.php b/user/modals/asset/asset_link_service.php similarity index 95% rename from user/ajax/ajax_asset_link_service.php rename to user/modals/asset/asset_link_service.php index 9f58c711..fecb87f4 100644 --- a/user/ajax/ajax_asset_link_service.php +++ b/user/modals/asset/asset_link_service.php @@ -1,6 +1,6 @@
    - + diff --git a/user/ticket.php b/user/ticket.php index 0142e978..28913d38 100644 --- a/user/ticket.php +++ b/user/ticket.php @@ -1156,11 +1156,8 @@ if (isset($_GET['ticket_id'])) {
    @@ -1172,11 +1169,8 @@ if (isset($_GET['ticket_id'])) { $additional_asset_icon = getAssetIcon($additional_asset_type); ?>
    - +