diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-07 11:37:03 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-07 11:37:03 +0100 |
| commit | 11f186a118285fbc87a536af26730780a9ad01f5 (patch) | |
| tree | fe6363b036f60f238916d070b3d0cb0625dd53c8 /app/controllers/softkeys_controller.rb | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | 3e19646f46c772e10ed3d7a45e8c974ab23f625b (diff) | |
Merge branch 'develop'5.1.1
Diffstat (limited to 'app/controllers/softkeys_controller.rb')
| -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) |