diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-29 18:44:51 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-29 18:44:51 +0100 |
commit | 731443c4120be0db84948906478db2df42da9d41 (patch) | |
tree | fa731414747a0dc664b8299aaeeb7f583821fba7 /app/controllers/call_forwards_controller.rb | |
parent | a9be92fdc62d55e6b6a8da80f0fe959ad90fa678 (diff) | |
parent | bf3af8f8a444365f3040da2928837986409fa016 (diff) |
Merge branch 'sso' into develop
Diffstat (limited to 'app/controllers/call_forwards_controller.rb')
-rw-r--r-- | app/controllers/call_forwards_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/call_forwards_controller.rb b/app/controllers/call_forwards_controller.rb index 001ed60..b1ced87 100644 --- a/app/controllers/call_forwards_controller.rb +++ b/app/controllers/call_forwards_controller.rb @@ -28,7 +28,7 @@ class CallForwardsController < ApplicationController @available_call_forward_cases = [] CallForwardCase.all.each do |available_call_forward_case| - if GuiFunction.display?("call_forward_case_#{available_call_forward_case.value}_field_in_call_forward_form", @current_user) + if GuiFunction.display?("call_forward_case_#{available_call_forward_case.value}_field_in_call_forward_form", current_user) @available_call_forward_cases << available_call_forward_case end end @@ -112,7 +112,7 @@ class CallForwardsController < ApplicationController voice_mail_destination, ] - if GuiFunction.display?('huntgroup_in_destination_field_in_call_forward_form', @current_user) + if GuiFunction.display?('huntgroup_in_destination_field_in_call_forward_form', current_user) HuntGroup.all.each do |hunt_group| hunt_group_destination = CallForwardingDestination.new() hunt_group_destination.id = "#{hunt_group.id}:HuntGroup" |