meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-22 00:11:14 +00:00
Code Issues Releases Wiki Activity

Make 2nd parameter optional in User#allowed_to_globally? for consistency (#6498).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13364 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Baptiste Barth 2014-09-06 03:39:52 +00:00
parent 63cb3680c1
commit d00f875800
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.rb
View File

@ -567,7 +567,11 @@ class User < Principal
# 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, &block)
#
# NB: this method is not used anywhere in the core codebase as of
# 2.5.2, but it's used by many plugins so if we ever want to remove
# it it has to be carefully deprecated for a version or two.
def allowed_to_globally?(action, options={}, &block)
allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
end

13
test/unit/user_test.rb
View File

@ -1019,6 +1019,19 @@ class UserTest < ActiveSupport::TestCase
end
end
# this is just a proxy method, the test only calls it to ensure it doesn't break trivially
context "#allowed_to_globally?" do
should "proxy to #allowed_to? and reflect global permissions" do
@dlopper2 = User.find(5) #only Developper on a project, not Manager anywhere
@anonymous = User.find(6)
assert_equal true, @jsmith.allowed_to_globally?(:delete_issue_watchers)
assert_equal false, @dlopper2.allowed_to_globally?(:delete_issue_watchers)
assert_equal true, @dlopper2.allowed_to_globally?(:add_issues)
assert_equal false, @anonymous.allowed_to_globally?(:add_issues)
assert_equal true, @anonymous.allowed_to_globally?(:view_issues)
end
end
context "User#notify_about?" do
context "Issues" do
setup do