diff options
| author | Peter Kozak <spag@golwen.net> | 2013-03-05 01:45:31 -0500 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-03-05 01:45:31 -0500 |
| commit | 2f2276dc424196ace5d1859dfa3d3999926effce (patch) | |
| tree | 1e1b465c9e867a404fccd1c10f22a42faf4aaea1 /app/controllers | |
| parent | ef4bb3de4a23e0a4068c46caf05e2150e9922b71 (diff) | |
bypassing softkeys controller
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/softkeys_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/softkeys_controller.rb b/app/controllers/softkeys_controller.rb index c9e8c20..9179d8c 100644 --- a/app/controllers/softkeys_controller.rb +++ b/app/controllers/softkeys_controller.rb @@ -2,7 +2,7 @@ class SoftkeysController < ApplicationController load_and_authorize_resource :sip_account, :except => [:sort] load_and_authorize_resource :softkey, :through => [:sip_account], :except => [:sort] - before_filter :set_available_call_forwards_and_softkey_functions, :only => [ :new, :edit, :update ] + before_filter :set_available_softkey_functions, :only => [ :new, :edit, :update ] before_filter :spread_breadcrumbs, :except => [:sort] def index @@ -54,12 +54,8 @@ class SoftkeysController < ApplicationController render nothing: true end - private - - def set_available_call_forwards_and_softkey_functions - @available_call_forwards = @softkey.possible_blf_call_forwards - + def set_available_softkey_functions @softkey_functions = [] SoftkeyFunction.accessible_by(current_ability, :read).each do |softkey_function| if GuiFunction.display?("softkey_function_#{softkey_function.name.downcase}_field_in_softkey_form", current_user) |