X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1392e63272e24a139cde80211bd0083221f3b455..3a43f9fe0421afdf74d2f570ee8987a4022519cf:/app/helpers/issues_helper.rb?ds=inline diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4dc1637de..e6c1adb16 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -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 - url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name) + 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 @@ -26,11 +26,11 @@ module IssuesHelper end def open_issues_count - count = Issue.open.limit(100).size + count = Issue.visible_to(current_user).open.limit(100).size if count > 99 - content_tag(:span, "99+", :class => "count-number") - elsif count > 0 - content_tag(:span, count, :class => "count-number") + tag.span("99+", :class => "count-number") + elsif count.positive? + tag.span(count, :class => "count-number") end end end