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

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

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
Show Stats 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); session:execute("transfer", ring_group_forward_destination.." XML "..context);
else else
--get the ring group destinations --get the ring group destinations
sql = [[ sql = [[SELECT
select r.ring_group_strategy, r.ring_group_timeout_app,
r.ring_group_strategy, r.ring_group_timeout_app, d.destination_number, d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt,
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
r.ring_group_timeout_data, r.ring_group_cid_name_prefix, FROM
r.ring_group_cid_number_prefix, r.ring_group_ringback, r.ring_group_skip_active v_ring_groups as r, v_ring_group_destinations as d
from WHERE
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 ( AND d.ring_group_uuid = ']]..ring_group_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 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)
@ -536,4 +526,4 @@
--table.insert(ACTIONS, {"set", "hangup_after_bridge=true"}); --table.insert(ACTIONS, {"set", "hangup_after_bridge=true"});
--table.insert(ACTIONS, {"set", "continue_on_fail=true"}); --table.insert(ACTIONS, {"set", "continue_on_fail=true"});
--table.insert(ACTIONS, {"bridge", app_data}); --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});