Fixed: User#allowed_to? returning true in any case if array of projects had only one item (#5332)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4233 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: User#allowed_to? returning true in any case if array of projects had only one item (#5332)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4233 e93f8b46-1217-0410-a6f0-8f06a7374b81
e59c927e · Jean-Baptiste Barth · e13790c6 · e59c927e · e59c927e
Commit e59c927e authored Oct 06, 2010 by Jean-Baptiste Barth
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

user.rb app/models/user.rb +4 -2

user_test.rb test/unit/user_test.rb +4 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -368,8 +368,10 @@ class User < Principal
      
    elsif project && project.is_a?(Array)
      # Authorize if user is authorized on every element of the array
-      project.inject do |memo,p|
-        memo && allowed_to?(action,p,options)
+      project.map do |p|
+        allowed_to?(action,p,options)
+      end.inject do |memo,p|
+        memo && p
      end
    elsif options[:global]
      # Admin users are always authorized

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -408,6 +408,10 @@ class UserTest < ActiveSupport::TestCase
        assert @jsmith.allowed_to?(:edit_issues, @jsmith.projects) #Manager or Developer everywhere
        assert ! @jsmith.allowed_to?(:delete_issue_watchers, @jsmith.projects) #Dev cannot delete_issue_watchers
      end
+      
+      should "behave correctly with arrays of 1 project" do
+        assert ! User.anonymous.allowed_to?(:delete_issues, [Project.first])
+      end
    end
    
    context "with options[:global]" do