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/softkeys_controller.rb | |
| parent | a9be92fdc62d55e6b6a8da80f0fe959ad90fa678 (diff) | |
| parent | bf3af8f8a444365f3040da2928837986409fa016 (diff) | |
Merge branch 'sso' into develop
Diffstat (limited to 'app/controllers/softkeys_controller.rb')
| -rw-r--r-- | app/controllers/softkeys_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/softkeys_controller.rb b/app/controllers/softkeys_controller.rb index d2a2bb9..8f363cd 100644 --- a/app/controllers/softkeys_controller.rb +++ b/app/controllers/softkeys_controller.rb @@ -61,7 +61,7 @@ class SoftkeysController < ApplicationController @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) + if GuiFunction.display?("softkey_function_#{softkey_function.name.downcase}_field_in_softkey_form", current_user) @softkey_functions << softkey_function end end |