X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..84aa7f455ae58b4b051368e35dbc43f780b3aa0f:/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 9fd8f1167..523f90846 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -5,35 +5,36 @@

<%= t ".search_guidance" %>

<%= form_tag(issues_path, :method => :get) do %> -
-
+
+
<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => "category_dropdown" }, - :class => "form-control custom-select" %> + :class => "form-select" %>
-
+
<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" }, - :class => "form-control custom-select" %> + :class => "form-select" %>
-
+
<%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user"), + :autocomplete => "on", :class => "form-control" %>
-
+
<%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => "category_dropdown" }, - :class => "form-control custom-select" %> + :class => "form-select" %>
-
+
<%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
@@ -58,15 +59,13 @@ <%= t ".states.#{issue.status}" %> <%= link_to t(".reports_count", :count => issue.reports_count), issue %> <%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %> - <%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %> + <%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %> <% if issue.user_updated %> - <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)), - :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), - :title => l(issue.updated_at) %> + <%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, issue.user_updated), + :time_ago => friendly_date_ago(issue.updated_at) %> <% else %> - <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), - :title => l(issue.updated_at) %> + <%= friendly_date_ago(issue.updated_at) %> <% end %>