X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/effb1b7f4170bb7244c4dfffcbe6134fe00e2bc4..ce63209f326d90ae07367008a78a7af9b812021c:/app/helpers/issues_helper.rb diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 715696445..e972c78ff 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -1,74 +1,59 @@ module IssuesHelper def reportable_url(reportable) - class_name = reportable.class.name - case class_name - when "DiaryEntry" - link_to reportable.title, :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id - when "User" - link_to reportable.display_name.to_s, :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name - when "DiaryComment" - link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :comment_id => reportable.id - when "Changeset" - link_to "Changeset ##{reportable.id}", :controller => :browse, :action => :changeset, :id => reportable.id - when "Note" - link_to "Note ##{reportable.id}", :controller => :browse, :action => :note, :id => reportable.id + case reportable + when DiaryEntry + diary_entry_url(reportable.user, reportable) + when User + user_url(reportable) + when DiaryComment + diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}") + when Note + note_url(reportable) end end - def reports_url(issue) - class_name = issue.reportable.class.name - case class_name - when "DiaryEntry" - link_to issue.reportable.title, issue - when "User" - link_to issue.reportable.display_name.to_s, issue - when "DiaryComment" - link_to "#{issue.reportable.diary_entry.title}, Comment id ##{issue.reportable.id}", issue - when "Changeset" - link_to "Changeset ##{issue.reportable.id}", issue - when "Note" - link_to "Note ##{issue.reportable.id}", issue + def reportable_title(reportable) + case reportable + when DiaryEntry + reportable.title + when User + reportable.display_name + when DiaryComment + I18n.t("issues.helper.reportable_title.diary_comment", :entry_title => reportable.diary_entry.title, :comment_id => reportable.id) + when Note + I18n.t("issues.helper.reportable_title.note", :note_id => reportable.id) end end - def instance_url(reportable) - class_name = reportable.class.name - case class_name - when "DiaryEntry" - link_to "Show Instance", :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id - when "User" - link_to "Show Instance", :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name - when "DiaryComment" - link_to "Show Instance", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :comment_id => reportable.id - when "Changeset" - link_to "Show Instance", :controller => :browse, :action => :changeset, :id => reportable.id - when "Note" - link_to "Show Instance", :controller => :browse, :action => :note, :id => reportable.id + def reportable_heading(reportable) + heading_params = { :title => link_to(reportable_title(reportable), reportable_url(reportable)) } + heading_params[:datetime_created] = reportable_heading_time(reportable.created_at) + heading_params[:datetime_updated] = reportable_heading_time(reportable.updated_at) unless reportable.is_a? User + + case reportable + when DiaryComment + t "issues.helper.reportable_heading.diary_comment_html", **heading_params + when DiaryEntry + t "issues.helper.reportable_heading.diary_entry_html", **heading_params + when Note + t "issues.helper.reportable_heading.note_html", **heading_params + when User + t "issues.helper.reportable_heading.user_html", **heading_params end end - def sortable(column, title = nil) - title ||= column.titleize - direction = column == sort_column && sort_direction == "asc" ? "desc" : "asc" - if column == sort_column - arrow = direction == "desc" ? ["25B2".hex].pack("U") : ["25BC".hex].pack("U") - title += arrow + 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 - # FIXME: link_to title, params.merge(:sort => column, :direction => direction) end - def report_type(report_class) - case report_class - when "DiaryEntry" - t("activerecord.models.diary_entry") - when "User" - t("activerecord.models.user") - when "DiaryComment" - t("activerecord.models.diary_comment") - when "Changeset" - t("activerecord.models.changeset") - when "Note" - t("activerecord.models.note") - end + private + + def reportable_heading_time(datetime) + tag.time l(datetime.to_datetime, :format => :friendly), :datetime => datetime.xmlschema end end