From d53d574be7d5ba720231093a6316a1d9c7352110 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Wed, 29 Apr 2015 00:29:20 +0000
Subject: [PATCH] Ring Group: Fixes Issue 927 - Assigned extensions set to DND
 (via the GUI) will not be included when the Ring Group executes.

---
 .../install/scripts/app/ring_groups/index.lua | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua
index b64e998dff..6cb0bc4077 100644
--- a/resources/install/scripts/app/ring_groups/index.lua
+++ b/resources/install/scripts/app/ring_groups/index.lua
@@ -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;