X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6..c07279e4585ad8cdc859eea61a9193aa849e7e32:/app/models/user.rb?ds=inline diff --git a/app/models/user.rb b/app/models/user.rb index 95f0e3986..54b3fa371 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -135,7 +135,7 @@ class User < ActiveRecord::Base end ## - # returns true if the user has the moderator role, false otherwise + # returns true if the user has the administrator role, false otherwise def administrator? has_role? 'administrator' end @@ -143,14 +143,14 @@ class User < ActiveRecord::Base ## # returns true if the user has the requested role def has_role?(role) - roles.inject(false) { |x, r| x or r.role == role } + roles.any? { |r| r.role == role } end ## # returns the first active block which would require users to view # a message, or nil if there are none. def blocked_on_view - active_blocks.inject(nil) { |s,x| s || (x.needs_view? ? x : nil) } + active_blocks.detect { |b| b.needs_view? } end def delete