From 25356dfde36d16e33f3b98729b3840bc95133311 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 18 Sep 2012 15:57:44 +0200 Subject: [PATCH 1/2] Replace incorrect .detect call by .any? --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index d0d1df8..b8cd746 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -464,7 +464,7 @@ class User < Principal roles = roles_for_project(context) return false unless roles - roles.detect {|role| + roles.any? {|role| (context.is_public? || role.member?) && role.allowed_to?(action) && (block_given? ? yield(role, self) : true) @@ -483,7 +483,7 @@ class User < Principal # authorize if user has at least one role that has this permission roles = memberships.collect {|m| m.roles}.flatten.uniq roles << (self.logged? ? Role.non_member : Role.anonymous) - roles.detect {|role| + roles.any? {|role| role.allowed_to?(action) && (block_given? ? yield(role, self) : true) } -- 1.7.12.503.g5976753