From 4402620584a2e8177252b33841fe37e2245b551f Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 29 Apr 2014 19:27:59 +0000 Subject: [PATCH] Set the default ring group destination order. Take 2 --- app/ring_groups/ring_groups.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index 516996495c..16ff015d44 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -70,7 +70,12 @@ require_once "resources/paging.php"; //prepare to page the results $sql = "select count(*) as num_rows from v_ring_groups "; $sql .= "where domain_uuid = '$domain_uuid' "; - if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; } + if (strlen($order_by) > 0) { + $sql .= "order by ring_group_name, ring_group_extension asc "; + } + else { + $sql .= "order by $order_by $order "; + } $prep_statement = $db->prepare($sql); if ($prep_statement) { $prep_statement->execute(); @@ -94,7 +99,12 @@ require_once "resources/paging.php"; //get the list $sql = "select * from v_ring_groups "; $sql .= "where domain_uuid = '$domain_uuid' "; - if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; } + if (strlen($order_by) > 0) { + $sql .= "order by ring_group_name, ring_group_extension 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();