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

Time Conditions - List: Implement natural sorting of Number column.

This commit is contained in:
fusionate 2023-10-19 18:54:07 +00:00
parent 2832e7ab66
commit c6a924f492
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/time_conditions/time_conditions.php
View File

@ -77,8 +77,9 @@
} }
//get order and order by //get order and order by
$order_by = $_GET["order_by"] ?? null; $order_by = $_GET["order_by"] ?? 'dialplan_name';
$order = $_GET["order"] ?? null; $order = $_GET["order"] ?? 'asc';
$sort = $order_by == 'dialplan_number' ? 'natural' : null;
//add the search variable //add the search variable
$search = $_GET["search"] ?? ''; $search = $_GET["search"] ?? '';
@ -123,7 +124,7 @@
//get the data //get the data
$sql = str_replace('count(dialplan_uuid)', '*', $sql); $sql = str_replace('count(dialplan_uuid)', '*', $sql);
$sql .= $order_by != '' ? order_by($order_by, $order) : " order by dialplan_order asc, dialplan_name asc "; $sql .= order_by($order_by, $order, null, null, $sort);
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
$database = new database; $database = new database;
$dialplans = $database->select($sql, $parameters ?? null, 'all'); $dialplans = $database->select($sql, $parameters ?? null, 'all');