Merge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix

[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..c9f8e2e6549e06429b23b024fd45717c927cac10 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,13 +1,11 @@
 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)
     if current_user&.administrator?
   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}")
         image = "roles/#{role}"
         alt = t("users.show.role.revoke.#{role}")
         title = t("users.show.role.revoke.#{role}")


@@ -20,17 +18,17 @@ 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
         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
       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")
+      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