Merge remote-tracking branch 'upstream/pull/4564'

[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 79e7cc012ad1e2c32e25a1f9df21c20bb983c4dc..b870d0273427a2bba3abc63f1b24e4756e6c9b60 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,11 +1,11 @@
 module UserRolesHelper
   def role_icons(user)
-    safe_join(UserRole::ALL_ROLES.collect { |role| role_icon(user, role) }.compact, " ")
+    safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ")
   end
 
   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}")
@@ -18,17 +18,15 @@ 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.role?(role)
       image = "roles/#{role}"
       alt = t("users.show.role.#{role}")
       title = t("users.show.role.#{role}")
     end
 
     if image
-      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)
-      icon = tag.picture(svg_icon + png_icon)
-      icon = link_to(icon, url, :method => :post, :confirm => confirm) if url
+      icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title)
+      icon = link_to(icon, url, :method => :post, :data => { :confirm => confirm }) if url
     end
 
     icon