Fix most auto-correctable rubocop issues

[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 369efca5a005fef5e2642a3eb18fafe49f6599b7..adc5b22e04df153ee5467635a29ceef91a65cb24 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,10 +1,10 @@
 module UserRolesHelper
   def role_icons(user)
-    UserRole::ALL_ROLES.reduce("".html_safe) { |s,r| s + " " + role_icon(user, r) }
+    UserRole::ALL_ROLES.reduce("".html_safe) { |s, r| s + " " + role_icon(user, r) }
   end
 
   def role_icon(user, role)
-    if @user and @user.administrator?
+    if @user && @user.administrator?
       if user.has_role?(role)
         image = "roles/#{role}.png"
         alt = t("user.view.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
-    elsif user.has_role?(role) 
+    elsif user.has_role?(role)
       image = "roles/#{role}.png"
       alt = t("user.view.role.#{role}")
       title = t("user.view.role.#{role}")