X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d377e8b4f23e6bad925eb2efa904baa7e1531fa6..640ea955fe1eb5c4719664e13f6b6bcc5c5ae7f6:/app/helpers/user_roles_helper.rb diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 2d3d49d77..805abb58f 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,10 +1,12 @@ module UserRolesHelper def role_icons(user) - UserRole::ALL_ROLES.reduce("".html_safe) { |a, e| a + " " + role_icon(user, e) } + UserRole::ALL_ROLES.reduce("".html_safe) do |acc, elem| + acc + " " + role_icon(user, elem) + end end def role_icon(user, role) - if @user && @user.administrator? + if current_user && current_user.administrator? if user.has_role?(role) image = "roles/#{role}" alt = t("user.view.role.revoke.#{role}") @@ -26,7 +28,7 @@ module UserRolesHelper if image svg_icon = tag("source", :srcset => image_path("#{image}.svg"), :type => "image/svg+xml") - png_icon = image_tag("#{image}.png", :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 = link_to(icon, url, :method => :post, :confirm => confirm) if url end