From 83291204369a1eef7b7673ef8c037c39d452a33b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 22 Sep 2023 17:37:09 -0600 Subject: [PATCH] Use ring_group_domain and ring_group_all permissions --- .../resources/dashboard/ring_group_forward.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/ring_groups/resources/dashboard/ring_group_forward.php b/app/ring_groups/resources/dashboard/ring_group_forward.php index 0c9bef19af..75bf39cfd9 100644 --- a/app/ring_groups/resources/dashboard/ring_group_forward.php +++ b/app/ring_groups/resources/dashboard/ring_group_forward.php @@ -104,18 +104,19 @@ } //get the list - if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) { - //show all ring groups + if (permission_exists('ring_group_domain') || permission_exists('ring_group_all')) { + //show all ring groups for the current domain $sql = "select * from v_ring_groups "; $sql .= "where domain_uuid = :domain_uuid "; $parameters['domain_uuid'] = $domain_uuid; } else { //show only assigned ring groups - $sql = "select r.ring_group_name, r.ring_group_uuid, r.ring_group_extension, r.ring_group_forward_destination, "; - $sql .= "r.ring_group_forward_enabled, r.ring_group_description from v_ring_groups as r, v_ring_group_users as u "; - $sql .= "where r.ring_group_uuid = u.ring_group_uuid "; - $sql .= "and r.domain_uuid = :domain_uuid "; + $sql = "select r.ring_group_uuid, r.ring_group_name, r.ring_group_extension, r.ring_group_strategy, "; + $sql .= "r.ring_group_forward_destination, r.ring_group_forward_enabled, r.ring_group_description "; + $sql .= "from v_ring_groups as r, v_ring_group_users as u "; + $sql .= "where r.domain_uuid = :domain_uuid "; + $sql .= "and r.ring_group_uuid = u.ring_group_uuid "; $sql .= "and u.user_uuid = :user_uuid "; $parameters['domain_uuid'] = $_SESSION['user']['domain_uuid']; $parameters['user_uuid'] = $_SESSION['user']['user_uuid']; @@ -291,4 +292,4 @@ echo ""; echo "\n"; -?> \ No newline at end of file +?>