From df6a3ea31dd1b5bb7c127d43d0af1e4c8c93d575 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 22 Jan 2018 10:32:25 -0700 Subject: [PATCH] Update index.lua --- .../install/scripts/app/ring_groups/index.lua | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index 99214c581b..1f901237a9 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -210,12 +210,23 @@ --get current switchname hostname = trim(api:execute("switchname", "")) +--get the domain_uuid if it not already set + if(domain_uuid == nil or domain_uuid == '' and domain_name) then + sql = "SELECT domain_uuid FROM v_domains as d "; + sql = sql .. "where d.domain_name = :domain_name "; + local params = {domain_name = domain_name}; + status = dbh:query(sql, params, function(row) + domain_uuid = row["domain_uuid"]; + end); + end + --get the ring group ring_group_forward_enabled = ""; ring_group_forward_destination = ""; sql = "SELECT r.* FROM v_ring_groups as r "; sql = sql .. "where r.ring_group_uuid = :ring_group_uuid "; - local params = {ring_group_uuid = ring_group_uuid}; + sql = sql .. "and r.domain_uuid = :domain_uuid "; + local params = {ring_group_uuid = ring_group_uuid, domain_uuid = domain_uuid}; status = dbh:query(sql, params, function(row) ring_group_name = row["ring_group_name"]; ring_group_extension = row["ring_group_extension"]; @@ -232,7 +243,8 @@ sql = "SELECT r.*, u.user_uuid FROM v_ring_groups as r, v_ring_group_users as u "; sql = sql .. "where r.ring_group_uuid = :ring_group_uuid "; sql = sql .. "and r.ring_group_uuid = u.ring_group_uuid "; - local params = {ring_group_uuid = ring_group_uuid}; + sql = sql .. "and r.domain_uuid = :domain_uuid "; + local params = {ring_group_uuid = ring_group_uuid, domain_uuid = domain_uuid}; status = dbh:query(sql, params, function(row) user_uuid = row["user_uuid"]; end);