diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /lib/redmine/access_control.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/access_control.rb')
| -rw-r--r-- | lib/redmine/access_control.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb index 68de56965..21359508b 100644 --- a/lib/redmine/access_control.rb +++ b/lib/redmine/access_control.rb @@ -58,9 +58,11 @@ module Redmine if action.is_a?(Symbol) perm = permission(action) !perm.nil? && perm.read? - else + elsif action.is_a?(Hash) s = "#{action[:controller]}/#{action[:action]}" permissions.detect {|p| p.actions.include?(s) && p.read?}.present? + else + raise ArgumentError.new("Symbol or a Hash expected, #{action.class.name} given: #{action}") end end |