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

Remove the code that is attempts and succeeds to prevent DND extension from affecting the Ring Groups because it also prevents calling external numbers and using bridge statements in the ring group. Will commit a fix soon that does an alternative way of removing extensions that are set to DND in FusionPBX's GUI.

Browse Source
This commit is contained in:
Mark Crane
2015-05-15 19:14:18 +00:00
parent 8b539a79fb
commit e6a0740375
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,30 +122,20 @@
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, 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 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
]]
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.domain_uuid = ']]..domain_uuid..[['
AND r.ring_group_enabled = 'true'
ORDER BY
d.destination_delay, d.destination_number asc
]];
--freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n");
destinations = {};
x = 1;