Update to rails 6.1.4.2

[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 93e090b0fd7c2d3941ddfe06f69250d997732b1e..c7516a51c920a068eaad9ede41009824b0118f89 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,35 +1,33 @@
 module UserRolesHelper
   def role_icons(user)
 module UserRolesHelper
   def role_icons(user)

-    UserRole::ALL_ROLES.reduce("".html_safe) do |acc, elem|
-      acc + " " + role_icon(user, elem)
-    end
+    safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ")

   end
 
   def role_icon(user, role)
   end
 
   def role_icon(user, role)

-    if current_user && current_user.administrator?
+    if current_user&.administrator?

       if user.has_role?(role)
         image = "roles/#{role}"
       if user.has_role?(role)
         image = "roles/#{role}"

-        alt = t("user.show.role.revoke.#{role}")
-        title = t("user.show.role.revoke.#{role}")
+        alt = t("users.show.role.revoke.#{role}")
+        title = t("users.show.role.revoke.#{role}")

         url = revoke_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role)
       else
         image = "roles/blank_#{role}"
         url = revoke_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role)
       else
         image = "roles/blank_#{role}"

-        alt = t("user.show.role.grant.#{role}")
-        title = t("user.show.role.grant.#{role}")
+        alt = t("users.show.role.grant.#{role}")
+        title = t("users.show.role.grant.#{role}")

         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)
       image = "roles/#{role}"
         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)
       image = "roles/#{role}"

-      alt = t("user.show.role.#{role}")
-      title = t("user.show.role.#{role}")
+      alt = t("users.show.role.#{role}")
+      title = t("users.show.role.#{role}")

     end
 
     if image
     end
 
     if image

-      svg_icon = tag("source", :srcset => image_path("#{image}.svg"), :type => "image/svg+xml")
+      svg_icon = tag.source(:srcset => image_path("#{image}.svg"), :type => "image/svg+xml")

       png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title)
       png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title)

-      icon = content_tag("picture", svg_icon + png_icon)
+      icon = tag.picture(svg_icon + png_icon)

       icon = link_to(icon, url, :method => :post, :confirm => confirm) if url
     end
 
       icon = link_to(icon, url, :method => :post, :confirm => confirm) if url
     end