X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02a6ec60ec204fb98f917e2a006bf38bb85876dc..25f83967dfa30ed4043852c1b2edf5414155d92f:/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 b2b3e913a..da00b5fea 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -6,35 +6,35 @@ <%= 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-select" %>
-
+
<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" }, :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-select" %>
-
+
<%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
@@ -61,13 +61,13 @@ <%= 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 %> + <% time_ago_tag = tag.abbr(time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), + :title => l(issue.updated_at)) %> <% 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, user_path(issue.user_updated)), + :time_ago => time_ago_tag %> <% 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) %> + <%= time_ago_tag %> <% end %>