X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c3ad6aa2923c03aeeea0b57033b0a9238d262aa2..3bd06529c7f9920c4f71498277f453bf1b8dd030:/app/views/issues/index.html.erb?ds=sidebyside diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 7a7da4578..4b7a2de50 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,42 +1,45 @@ -
<%= notice %>
- <% content_for :heading do %> -<%= t ".search_guidance" %>
+<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %> +<%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %> +<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %> +<%= select :last_updated_by, nil, @users.all.collect {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %> +<%= submit_tag t(".search") %> <% end %><%= t ".issues_not_found" %>
+<% end %> +<%= sortable("status") %> | -<%= sortable("report_count", "Number of Reports") %> | -<%= sortable("updated_at","Last updated at") %> | -<%= sortable("updated_by","Last updated by") %> | -Link to reports | -<%= sortable("reported_user_id","Reported User") %> | -Link to reported instance | +<%= t ".status" %> | +<%= t ".number_of_reports" %> | +<%= t ".last_updated_at" %> | +<%= t ".last_updated_by" %> | +<%= t ".link_to_reports" %> | +<%= t ".reported_user" %> | +<%= t ".link_to_reported_instance" %> |
<%= issue.status.humanize %> | -<%= issue.report_count %> | +<%= t "issues.states.#{issue.status}" %> | +<%= issue.reports_count %> | <%= l(issue.updated_at.to_datetime, :format => :friendly) %> | <% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %> | -<%= reports_url(issue) %> | -<%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %> | -<%= instance_url(issue.reportable) %> | +<%= link_to reportable_title(issue.reportable), issue %> | +<%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %> | +<%= link_to t(".show_instance"), reportable_url(issue.reportable) %> |