Update device_keys.php
This commit is contained in:
parent
3285483665
commit
64c6527ab8
|
|
@ -333,10 +333,7 @@
|
||||||
//get the device keys in the right order where device keys are listed after the profile keys
|
//get the device keys in the right order where device keys are listed after the profile keys
|
||||||
if (!empty($device_uuid) && is_uuid($device_uuid)) {
|
if (!empty($device_uuid) && is_uuid($device_uuid)) {
|
||||||
$sql = "select * from v_device_keys ";
|
$sql = "select * from v_device_keys ";
|
||||||
$sql .= "where (";
|
$sql .= "where device_uuid = :device_uuid ";
|
||||||
$sql .= "device_uuid = :device_uuid ";
|
|
||||||
$sql .= is_uuid($device_profile_uuid) ? "or device_profile_uuid = :device_profile_uuid " : null;
|
|
||||||
$sql .= ") ";
|
|
||||||
$sql .= "order by ";
|
$sql .= "order by ";
|
||||||
$sql .= "device_key_vendor asc, ";
|
$sql .= "device_key_vendor asc, ";
|
||||||
$sql .= "case device_key_category ";
|
$sql .= "case device_key_category ";
|
||||||
|
|
@ -348,9 +345,6 @@
|
||||||
$sql .= $db_type == "mysql" ? "device_key_id asc " : "cast(device_key_id as numeric) asc, ";
|
$sql .= $db_type == "mysql" ? "device_key_id asc " : "cast(device_key_id as numeric) asc, ";
|
||||||
$sql .= "case when device_uuid is null then 0 else 1 end asc ";
|
$sql .= "case when device_uuid is null then 0 else 1 end asc ";
|
||||||
$parameters['device_uuid'] = $device_uuid;
|
$parameters['device_uuid'] = $device_uuid;
|
||||||
if (is_uuid($device_profile_uuid)) {
|
|
||||||
$parameters['device_profile_uuid'] = $device_profile_uuid;
|
|
||||||
}
|
|
||||||
$keys = $database->select($sql, $parameters, 'all');
|
$keys = $database->select($sql, $parameters, 'all');
|
||||||
unset($sql, $parameters);
|
unset($sql, $parameters);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue