summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-22 12:33:44 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-22 12:33:44 +0100
commit65f95f2b6b8bca179c1db20cfb1769738f0b9d9b (patch)
tree49695b7ea1d4c207f3fc9ea56ada0d35086a5334 /app/controllers
parent77a3c41cbb7edb93dcc98b7ae18a1b58e0d2d2ef (diff)
parentbc4e559c08616de312906903a1c89eb74d09ffd7 (diff)
Merge branch 'feature/show_sip_account_in_acd' into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/acd_agents_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/acd_agents_controller.rb b/app/controllers/acd_agents_controller.rb
index 1d119b3..4c08f68 100644
--- a/app/controllers/acd_agents_controller.rb
+++ b/app/controllers/acd_agents_controller.rb
@@ -28,6 +28,8 @@ class AcdAgentsController < ApplicationController
@acd_agent.name = "#{t('acd_agents.name')} #{i}"
@acd_agent.status = 'active'
@acd_agent.calls_answered = 0
+
+ @available_sip_accounts = SipAccount.all - @automatic_call_distributor.acd_agents.where(:destination_type => 'SipAccount').map{|acd_agent| acd_agent.destination}
end
def create
@@ -41,6 +43,8 @@ class AcdAgentsController < ApplicationController
def edit
@acd_agent = AcdAgent.find(params[:id])
+
+ @available_sip_accounts = SipAccount.all
end
def update