dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ring Groups - List: Clean up of order by.

This commit is contained in:
fusionate 2023-10-19 18:55:49 +00:00
parent 0e9fd9aaa6
commit fb834ccf8a
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/ring_groups/ring_groups.php
View File

@ -78,8 +78,9 @@
} }
//get order and order by //get order and order by
$order_by = $_GET["order_by"] ?? ''; $order_by = $_GET["order_by"] ?? 'ring_group_name';
$order = $_GET["order"] ?? ''; $order = $_GET["order"] ?? 'asc';
$sort = $order_by == 'ring_group_extension' ? 'natural' : null;
//add the search term //add the search term
if (isset($_GET["search"])) { if (isset($_GET["search"])) {
@ -165,7 +166,7 @@
$sql .= ") "; $sql .= ") ";
$parameters['search'] = '%'.$search.'%'; $parameters['search'] = '%'.$search.'%';
} }
$sql .= ($order_by) ? order_by($order_by, $order) : "order by ring_group_name asc, ring_group_extension asc "; $sql .= order_by($order_by, $order, null, null, $sort);
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
$ring_groups = $database->select($sql, $parameters, 'all'); $ring_groups = $database->select($sql, $parameters, 'all');
unset($sql, $parameters); unset($sql, $parameters);