cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/1973'

Browse source
This commit is contained in:
Tom Hughes 2018-09-05 19:01:24 +01:00
commit 70cca71f38
10 changed files with 52 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/issues_helper.rb
View file

@ -2,11 +2,11 @@ module IssuesHelper
def reportable_url(reportable)
case reportable
when DiaryEntry
url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
diary_entry_url(reportable.user, reportable)
when User
user_url(reportable)
when DiaryComment
url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
when Note
url_for(:controller => :browse, :action => :note, :id => reportable.id)
end