From c6a924f492e71e9f8cfd8c2e45d366ca136d2df0 Mon Sep 17 00:00:00 2001 From: fusionate Date: Thu, 19 Oct 2023 18:54:07 +0000 Subject: [PATCH] Time Conditions - List: Implement natural sorting of Number column. --- app/time_conditions/time_conditions.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index cfc468d581..b9d6d0e580 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -77,8 +77,9 @@ } //get order and order by - $order_by = $_GET["order_by"] ?? null; - $order = $_GET["order"] ?? null; + $order_by = $_GET["order_by"] ?? 'dialplan_name'; + $order = $_GET["order"] ?? 'asc'; + $sort = $order_by == 'dialplan_number' ? 'natural' : null; //add the search variable $search = $_GET["search"] ?? ''; @@ -123,7 +124,7 @@ //get the data $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); $database = new database; $dialplans = $database->select($sql, $parameters ?? null, 'all');