From 7f245d827bccd44daa37d6fcfe03c34d7a54d4ba Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 10 Sep 2016 16:13:20 -0600 Subject: [PATCH] Update device_vendor_functions.php Add label to the functions list and order by the name. --- app/devices/device_vendor_functions.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php index a3d84c7946..2227886902 100644 --- a/app/devices/device_vendor_functions.php +++ b/app/devices/device_vendor_functions.php @@ -42,7 +42,7 @@ $sql = "select count(*) as num_rows from v_device_vendor_functions "; $sql .= "where device_vendor_uuid = '$device_vendor_uuid' "; $sql .= $sql_search; - if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } + if (strlen($order_by) == 0) { $sql .= "order by name asc "; } else { $sql .= "order by $order_by $order "; } $prep_statement = $db->prepare($sql); if ($prep_statement) { $prep_statement->execute(); @@ -67,7 +67,7 @@ $sql = "select * from v_device_vendor_functions "; $sql .= "where device_vendor_uuid = '$device_vendor_uuid' "; $sql .= $sql_search; - if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } + if (strlen($order_by) == 0) { $sql .= "order by name asc "; } else { $sql .= "order by $order_by $order "; } $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); @@ -94,6 +94,7 @@ echo "\n"; echo "\n"; + echo "\n"; echo th_order_by('name', $text['label-name'], $order_by, $order); echo th_order_by('value', $text['label-value'], $order_by, $order); echo "\n"; @@ -145,8 +146,8 @@ } //show the row of data echo "\n"; - //echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n";
".$text['label-label']."".$text['label-groups']."
".$row['label']." ".$row['name']." ".$text['label-'.$row['name']]." ".$row['name']."  ".$row['value']." ".$group_list." ".$row['enabled']."