nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PeopleHelper#person_link and #person_image_link with frozen strings

Browse source
This commit is contained in:
Benjamin Neff 2017-08-27 18:10:21 +02:00
parent e82690963d
commit a6b6251b53
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/helpers/people_helper.rb
View file

@ -26,11 +26,9 @@ module PeopleHelper
end end
def person_link(person, opts={}) def person_link(person, opts={})
opts[:class] ||= "" css_class = person_link_class(person, opts[:class])
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}'>"\ "<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{css_class}'>"\
"#{html_escape_once(opts[:display_name] || person.name)}</a>"\ "#{html_escape_once(opts[:display_name] || person.name)}</a>"\
.html_safe .html_safe
end end
@ -46,11 +44,9 @@ module PeopleHelper
if opts[:to] == :photos if opts[:to] == :photos
link_to person_image_tag(person, opts[:size]), person_photos_path(person) link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else else
opts[:class] ||= "" css_class = person_link_class(person, opts[:class])
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"<a href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}> "<a href='#{remote_or_hovercard_link}' class='#{css_class}' #{('target=' + opts[:target]) if opts[:target]}>
#{person_image_tag(person, opts[:size])} #{person_image_tag(person, opts[:size])}
</a>".html_safe </a>".html_safe
end end
@ -79,4 +75,14 @@ module PeopleHelper
return Rails.application.routes.url_helpers.person_path(person, opts) return Rails.application.routes.url_helpers.person_path(person, opts)
end end
end end
private
def person_link_class(person, css_class)
return css_class unless defined?(user_signed_in?) && user_signed_in?
return "#{css_class} self" if current_user.person == person
"#{css_class} hovercardable"
end
end end