From 65b6b7f5a97dee63aae48d28aa38e7c940370006 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 22:32:21 +0000 Subject: [PATCH] Merged r4164 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4190 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index c5c638f93..5ae7a56d3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -352,6 +352,12 @@ class User < Principal false end end + + # Is the user allowed to do the specified action on any project? + # See allowed_to? for the actions and valid options. + def allowed_to_globally?(action, options) + allowed_to?(action, nil, options.reverse_merge(:global => true)) + end def self.current=(user) @current_user = user