nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ring Group: Fixes Issue 927 - Assigned extensions set to DND (via the GUI) will not be included when the Ring Group executes.

Browse Source
This commit is contained in:
Nate Jones
2015-04-29 00:29:20 +00:00
parent fdfc134ddc
commit d53d574be7
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,13 +121,29 @@
session:execute("transfer", ring_group_forward_destination.." XML "..context);
else
--get the ring group destinations
sql =
[[ SELECT r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, 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
FROM v_ring_groups as r, v_ring_group_destinations as d
where d.ring_group_uuid = r.ring_group_uuid
and d.ring_group_uuid = ']]..ring_group_uuid..[['
and r.ring_group_enabled = 'true'
order by d.destination_delay, d.destination_number asc ]]
sql = [[
select
r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number,
d.destination_delay, d.destination_timeout, d.destination_prompt,
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
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
and (
d.destination_number = e.extension
or d.destination_number = e.number_alias
)
and (
e.do_not_disturb = 'false'
or e.do_not_disturb is null
)
and d.ring_group_uuid = ']]..ring_group_uuid..[['
and r.ring_group_enabled = 'true'
order by
d.destination_delay asc, d.destination_number asc
]]
--freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n");
destinations = {};
x = 1;