Use Activerecord '#or' method for queries

[rails.git] / app / helpers / user_roles_helper.rb

diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index a8bc06b6e699c286eed1ae5a29ddd6953e296403..c9f8e2e6549e06429b23b024fd45717c927cac10 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -5,7 +5,7 @@ module UserRolesHelper
 
   def role_icon(user, role)
     if current_user&.administrator?
 
   def role_icon(user, role)
     if current_user&.administrator?

-      if user.has_role?(role)
+      if user.role?(role)

         image = "roles/#{role}"
         alt = t("users.show.role.revoke.#{role}")
         title = t("users.show.role.revoke.#{role}")
         image = "roles/#{role}"
         alt = t("users.show.role.revoke.#{role}")
         title = t("users.show.role.revoke.#{role}")


@@ -18,7 +18,7 @@ module UserRolesHelper
         url = grant_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
       end
         url = grant_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
       end

-    elsif user.has_role?(role)
+    elsif user.role?(role)

       image = "roles/#{role}"
       alt = t("users.show.role.#{role}")
       title = t("users.show.role.#{role}")
       image = "roles/#{role}"
       alt = t("users.show.role.#{role}")
       title = t("users.show.role.#{role}")