diff options
| author | Peter Kozak <spag@golwen.net> | 2013-07-09 12:11:16 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-07-09 12:11:16 +0200 |
| commit | e1b8a3961833f66f03659d16b2737ab62efd999c (patch) | |
| tree | ffa3a2e0ea10752e1be5da571650e4df3b6ad1dd /app/controllers | |
| parent | e59fda6f6dd64dfe0bd2cdea66b19e3ba1fa4f90 (diff) | |
| parent | 3def6156141c1235d1ab0782900d43c097676243 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/call_forwards_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/call_forwards_controller.rb b/app/controllers/call_forwards_controller.rb index 1721aa3..f9d2faa 100644 --- a/app/controllers/call_forwards_controller.rb +++ b/app/controllers/call_forwards_controller.rb @@ -29,8 +29,8 @@ class CallForwardsController < ApplicationController @call_forward.depth = GsParameter.get('DEFAULT_CALL_FORWARD_DEPTH') @call_forward.active = true @call_forwarding_destinations = call_forwarding_destination_types() + @call_forward.destinationable_type = 'PhoneNumber' @call_forward.destination = GsParameter.get('CALLFORWARD_DESTINATION_DEFAULT').to_s if defined?(GsParameter.get('CALLFORWARD_DESTINATION_DEFAULT')) - @destination_phone_number = @call_forward.destination @available_call_forward_cases = [] CallForwardCase.all.each do |available_call_forward_case| @@ -66,7 +66,6 @@ class CallForwardsController < ApplicationController @available_call_forward_cases = CallForwardCase.all @call_forwarding_destinations = call_forwarding_destination_types() @available_greetings = available_greetings() - @destination_phone_number = @call_forward.destination if @call_forward.call_forwarding_destination == ':PhoneNumber' end def update |