X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7..16e97c57caf4770e1c6c0e6d52f9f5b2310a0e19:/app/helpers/issues_helper.rb?ds=sidebyside diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4ecd7001a..55bd0952f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -8,7 +8,7 @@ module IssuesHelper when DiaryComment 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) + note_url(reportable) end end @@ -26,11 +26,11 @@ module IssuesHelper end def open_issues_count - 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") + count = Issue.visible_to(current_user).open.limit(Settings.max_issues_count).size + if count >= Settings.max_issues_count + tag.span(I18n.t("count.at_least_pattern", :count => Settings.max_issues_count), :class => "badge count-number") + elsif count.positive? + tag.span(count, :class => "badge count-number") end end end