Fix confirmation prompt when granting or revoking roles

[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 43807659243f47f1ddf6c8d91eccfb43701cb192..a8bc06b6e699c286eed1ae5a29ddd6953e296403 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,8 +1,6 @@
 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)


@@ -27,10 +25,10 @@ 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)
       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 = link_to(icon, url, :method => :post, :data => { :confirm => confirm }) if url

     end
 
     icon
     end
 
     icon