Merge branch 'master' into feature/add-communities-page

[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..c7516a51c920a068eaad9ede41009824b0118f89 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,6 +1,6 @@
 module UserRolesHelper
   def role_icons(user)
 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)
   end
 
   def role_icon(user, role)


@@ -25,7 +25,7 @@ module UserRolesHelper
     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)
       icon = tag.picture(svg_icon + png_icon)
       icon = link_to(icon, url, :method => :post, :confirm => confirm) if url
       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