Commit 11603f54 authored by Jonne Haß's avatar Jonne Haß

Merge pull request #4843 from svbergerem/4228-hovercards-same-pod

Show hovercards in the notification drop-down for users on the same pod

Conflicts:
	Changelog.md
parents 3fae9669 aefcfc7b
......@@ -21,6 +21,7 @@
* Render HTML in atom user feed [#4835](https://github.com/diaspora/diaspora/pull/4835)
* Fix plaintext mode of Mentionable [#4294](https://github.com/diaspora/diaspora/issues/4294)
* Fixed Atom Feed Error if reshared Post is deleted [#4638] (https://github.com/diaspora/diaspora/issues/4638)
* Show hovercards in the notification drop-down for users on the same pod [#4843](https://github.com/diaspora/diaspora/pull/4843)
## Features
* You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
......
......@@ -36,7 +36,7 @@ module PeopleHelper
opts[:class] ||= ""
opts[:class] << " self" 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
"<a data-hovercard='#{remote_or_hovercard_link}' #{person_href(person)} class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe
"<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>#{h(person.name)}</a>".html_safe
end
def person_image_tag(person, size = :thumb_small)
......
......@@ -58,6 +58,10 @@ describe PeopleHelper do
@person.profile.last_name = "I'm <h1>Evil"
person_link(@person).should_not include("<h1>")
end
it 'links by id for a local user' do
person_link(@user.person).should include "href='#{person_path(@user.person)}'"
end
end
describe "#person_href" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment