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

Assets: Fix Description not displaying, Fix issue with unitialized OS var, fix client asset uri using asset_uri_2

Browse Source
This commit is contained in:
johnnyq
2025-08-25 14:07:55 -04:00
parent 373f1574bd
commit 0e54359db8
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
user/assets.php
View File

@@ -136,10 +136,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
// OS typeahead suggestions // OS typeahead suggestions
$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL"); $os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL");
if (mysqli_num_rows($os_sql) > 0) { if ($os_sql && mysqli_num_rows($os_sql) > 0) {
while ($row = mysqli_fetch_array($os_sql)) { $os_arr = [];
$os_arr[] = $row; 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); $json_os = json_encode($os_arr);
} }
@@ -373,7 +376,7 @@ if (mysqli_num_rows($os_sql) > 0) {
Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?> Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?> <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'server') { ?>
<th> <th>
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>"> <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">
Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?> Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?>
@@ -434,7 +437,7 @@ if (mysqli_num_rows($os_sql) > 0) {
</a> </a>
</th> </th>
<?php } ?> <?php } ?>
<?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?> <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'server' && $_GET['type'] !== 'other') { ?>
<th> <th>
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>"> <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?> Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
@@ -473,9 +476,9 @@ if (mysqli_num_rows($os_sql) > 0) {
$asset_name = nullable_htmlentities($row['asset_name']); $asset_name = nullable_htmlentities($row['asset_name']);
$asset_description = nullable_htmlentities($row['asset_description']); $asset_description = nullable_htmlentities($row['asset_description']);
if ($asset_description) { if ($asset_description) {
$asset_description_display = "-";
} else {
$asset_description_display = $asset_description; $asset_description_display = $asset_description;
} else {
$asset_description_display = "-";
} }
$asset_make = nullable_htmlentities($row['asset_make']); $asset_make = nullable_htmlentities($row['asset_make']);
$asset_model = nullable_htmlentities($row['asset_model']); $asset_model = nullable_htmlentities($row['asset_model']);
@@ -586,7 +589,7 @@ if (mysqli_num_rows($os_sql) > 0) {
</a> </a>
</td> </td>
<?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?> <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'server') { ?>
<td><?php echo $asset_type; ?></td> <td><?php echo $asset_type; ?></td>
<?php } ?> <?php } ?>
<?php if ($_GET['type'] !== 'virtual') { ?> <?php if ($_GET['type'] !== 'virtual') { ?>
@@ -618,7 +621,7 @@ if (mysqli_num_rows($os_sql) > 0) {
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?> <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
<td><?php echo $asset_warranty_expire_display; ?></td> <td><?php echo $asset_warranty_expire_display; ?></td>
<?php } ?> <?php } ?>
<?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?> <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'server') { ?>
<td><?php echo $contact_name_display; ?></td> <td><?php echo $contact_name_display; ?></td>
<?php } ?> <?php } ?>
<td> <td>
@@ -650,7 +653,7 @@ if (mysqli_num_rows($os_sql) > 0) {
<?php } ?> <?php } ?>
<?php if ($asset_uri_client) { ?> <?php if ($asset_uri_client) { ?>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="<?php echo $asset_uri_2; ?>" target="_blank" class="dropdown-item" > <a href="<?php echo $asset_uri_client; ?>" target="_blank" class="dropdown-item" >
<i class="fa fa-fw fa-external-link-alt mr-2"></i>Client URI: <?php echo truncate($asset_uri_client,40); ?> <i class="fa fa-fw fa-external-link-alt mr-2"></i>Client URI: <?php echo truncate($asset_uri_client,40); ?>
</a> </a>
<?php } ?> <?php } ?>