X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c..be94bd79394006853e03e2185d252672eb0ce6a0:/app/helpers/issues_helper.rb diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 3c13c6536..55bd0952f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -2,13 +2,13 @@ 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) + note_url(reportable) end end @@ -19,9 +19,18 @@ module IssuesHelper when User reportable.display_name when DiaryComment - "#{reportable.diary_entry.title}, Comment id ##{reportable.id}" + I18n.t("issues.helper.reportable_title.diary_comment", :entry_title => reportable.diary_entry.title, :comment_id => reportable.id) when Note - "Note ##{reportable.id}" + I18n.t("issues.helper.reportable_title.note", :note_id => reportable.id) + end + end + + def open_issues_count + 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