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

Remove the DND check on the ring groups as it caused the query to return duplicate destination numbers.

Browse Source
This commit is contained in:
Mark Crane
2015-05-05 06:35:43 +00:00
parent 7f9e98e988
commit 8cda7312cd
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

@@ -121,30 +121,20 @@
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, v_extensions as e
where
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.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");
AND d.ring_group_uuid = ']]..ring_group_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;
assert(dbh:query(sql, function(row)
@@ -536,4 +526,4 @@
--table.insert(ACTIONS, {"set", "hangup_after_bridge=true"});
--table.insert(ACTIONS, {"set", "continue_on_fail=true"});
--table.insert(ACTIONS, {"bridge", app_data});
--table.insert(ACTIONS, {ring_group_timeout_app, ring_group_timeout_data});
--table.insert(ACTIONS, {ring_group_timeout_app, ring_group_timeout_data});