From fb834ccf8aaaec9768a45f13fa7c2fe5fd25ec16 Mon Sep 17 00:00:00 2001 From: fusionate Date: Thu, 19 Oct 2023 18:55:49 +0000 Subject: [PATCH] Ring Groups - List: Clean up of order by. --- app/ring_groups/ring_groups.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index cf567ff608..6270b388f6 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -78,8 +78,9 @@ } //get order and order by - $order_by = $_GET["order_by"] ?? ''; - $order = $_GET["order"] ?? ''; + $order_by = $_GET["order_by"] ?? 'ring_group_name'; + $order = $_GET["order"] ?? 'asc'; + $sort = $order_by == 'ring_group_extension' ? 'natural' : null; //add the search term if (isset($_GET["search"])) { @@ -165,7 +166,7 @@ $sql .= ") "; $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); $ring_groups = $database->select($sql, $parameters, 'all'); unset($sql, $parameters);