From 8314a115bb5b9da8d03923a4f8c3a37f06eb6995 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 Oct 2025 19:05:37 -0400 Subject: [PATCH] Migrate Add Asset to the new ajax-modal --- agent/assets.php | 40 +- agent/contact_details.php | 3 +- agent/modals/asset/asset_add.php | 903 ++++++++++++++------------- agent/modals/asset/asset_edit.php | 77 +-- agent/modals/contact/contact_add.php | 2 - 5 files changed, 520 insertions(+), 505 deletions(-) diff --git a/agent/assets.php b/agent/assets.php index 9b9cc93d..c9e10443 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -37,17 +37,23 @@ enforceUserPermission('module_support'); //Asset Type from GET if (isset($_GET['type']) && ($_GET['type']) == 'workstation') { $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'"; + $type_filter = "workstation"; } elseif (isset($_GET['type']) && ($_GET['type']) == 'server') { $type_query = "asset_type = 'server'"; + $type_filter = "server"; } elseif (isset($_GET['type']) && ($_GET['type']) == 'virtual') { $type_query = "asset_type = 'Virtual Machine'"; + $type_filter = "virtual"; } elseif (isset($_GET['type']) && ($_GET['type']) == 'network') { $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'"; + $type_filter = "network"; } elseif (isset($_GET['type']) && ($_GET['type']) == 'other') { $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'"; + $type_filter = "other"; } else { $type_query = "asset_type LIKE '%'"; $_GET['type'] = ''; + $type_filter = ''; } if (!$client_url) { @@ -133,19 +139,6 @@ $sql = mysqli_query( $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - -// OS typeahead suggestions -$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL"); -if ($os_sql && mysqli_num_rows($os_sql) > 0) { - $os_arr = []; - while ($row = mysqli_fetch_assoc($os_sql)) { - // jQuery UI Autocomplete expects {label: "...", value: "..."} - $label = $row['label']; - $os_arr[] = ['label' => $label, 'value' => $label]; - } - $json_os = json_encode($os_arr); -} - ?>
@@ -185,8 +178,8 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) {
= 2) { ?>
-
@@ -716,24 +709,7 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) { - - - - - New Recurring Ticket
- + New Asset
@@ -1175,7 +1175,6 @@ if (isset($_GET['contact_id'])) { require_once "modals/ticket/ticket_add.php"; require_once "modals/recurring_ticket/recurring_ticket_add.php"; -require_once "modals/asset/asset_add.php"; require_once "modals/credential/credential_add.php"; require_once "modals/document/document_add.php"; require_once "modals/file/file_upload.php"; diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php index fe52e0ad..0b6ebccf 100644 --- a/agent/modals/asset/asset_add.php +++ b/agent/modals/asset/asset_add.php @@ -1,455 +1,496 @@ - @@ -167,14 +168,14 @@ ob_start();
- +
-
+
@@ -227,7 +228,7 @@ ob_start();
- +
@@ -237,7 +238,7 @@ ob_start();
- +
@@ -247,7 +248,7 @@ ob_start();
- + @@ -257,7 +258,7 @@ ob_start();
- + @@ -282,7 +283,7 @@ ob_start(); -
+
@@ -290,7 +291,7 @@ ob_start();
- +
@@ -315,7 +316,7 @@ ob_start(); $location_name_select_display = $location_name_select; } ?> - + @@ -343,8 +344,8 @@ ob_start(); $contact_name_select_display = $contact_name_select; } ?> - @@ -360,7 +361,7 @@ ob_start();
@@ -368,7 +369,7 @@ ob_start(); -
+
@@ -391,7 +392,7 @@ ob_start(); $vendor_name_select_display = $vendor_name_select; } ?> - + @@ -405,7 +406,7 @@ ob_start();
- +
@@ -415,7 +416,7 @@ ob_start();
- +
@@ -426,7 +427,7 @@ ob_start();
- + @@ -437,18 +438,18 @@ ob_start();
- + -
+
- asset_photo"> + asset_photo">
@@ -458,7 +459,7 @@ ob_start();
- +

Asset ID:

@@ -466,7 +467,7 @@ ob_start();
-
+
diff --git a/agent/modals/contact/contact_add.php b/agent/modals/contact/contact_add.php index 4316776c..6c503027 100644 --- a/agent/modals/contact/contact_add.php +++ b/agent/modals/contact/contact_add.php @@ -350,5 +350,3 @@ $(document).ready(function() {