diff options
| author | spag <spag@golwen.net> | 2013-01-29 20:59:22 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-29 20:59:22 +0100 |
| commit | 880cf1cd12ff8851337bc67f9c29ac53229ac911 (patch) | |
| tree | 5b685363a9928ceb457fa956cb2880d485276510 /app/controllers/softkeys_controller.rb | |
| parent | 9928e509175ec6dbb9cd77aaeb06168c0de99d38 (diff) | |
| parent | 5d84248cf177635a19f033f53abbca87ac5c87bc (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 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 |