dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ring Groups: DND extensions not included when retrieving Ring Group destinations (real fix for Issue 927, re: r8338).

This commit is contained in:
Nate Jones 2015-05-12 05:59:33 +00:00
parent 0c79ebb6e9
commit b2dd3ba7ad
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
resources/install/scripts/app/ring_groups/index.lua
View File

@ -121,21 +121,32 @@
session:execute("transfer", ring_group_forward_destination.." XML "..context); session:execute("transfer", ring_group_forward_destination.." XML "..context);
else else
--get the ring group destinations --get the ring group destinations
sql = [[SELECT sql = [[
r.ring_group_strategy, r.ring_group_timeout_app, select
d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number,
r.ring_group_timeout_data, r.ring_group_cid_name_prefix, r.ring_group_cid_number_prefix, r.ring_group_ringback, r.ring_group_skip_active d.destination_delay, d.destination_timeout, d.destination_prompt,
FROM r.ring_group_timeout_data, r.ring_group_cid_name_prefix,
v_ring_groups as r, v_ring_group_destinations as d r.ring_group_cid_number_prefix, r.ring_group_ringback, r.ring_group_skip_active
WHERE from
v_ring_groups as r, v_ring_group_destinations as d, v_extensions as e
where
d.ring_group_uuid = r.ring_group_uuid d.ring_group_uuid = r.ring_group_uuid
AND d.ring_group_uuid = ']]..ring_group_uuid..[[' and (
AND r.domain_uuid = ']]..domain_uuid..[[' d.destination_number = e.extension
AND r.ring_group_enabled = 'true' or d.destination_number = e.number_alias
ORDER BY )
d.destination_delay, d.destination_number asc and (
]]; e.do_not_disturb = 'false'
--freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n"); or e.do_not_disturb is null
)
and d.ring_group_uuid = ']]..ring_group_uuid..[['
and e.domain_uuid = ']]..domain_uuid..[['
and r.domain_uuid = ']]..domain_uuid..[['
and r.ring_group_enabled = 'true'
order by
d.destination_delay asc, d.destination_number asc
]]
--freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n");
destinations = {}; destinations = {};
x = 1; x = 1;
assert(dbh:query(sql, function(row) assert(dbh:query(sql, function(row)