X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/918a382cad0cf9f8cbf2a47359d48773065c88f6..93f14890488d9ac7780c3e8ac3bdc2808b370f90:/app/views/issues/index.html.erb diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 2a3e1959f..1f3ca3118 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -4,21 +4,21 @@ <%= form_tag(issues_path, :method => :get) do %>

<%= t ".search_guidance" %>

-<%= select :status, nil, options_for_select(Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, params[:status]), { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %> -<%= select :issue_type, nil, options_for_select(@issue_types, params[:issue_type]), { :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, 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' } %> -<%= submit_tag t(".search") %> +<%= 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" } %> +<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" } %> +<%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %> +<%= 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" } %> +<%= submit_tag t(".search"), :name => nil %> <% end %> -
+
<% if @issues.length == 0 %>

<%= t ".issues_not_found" %>

<% end %> -
+
- +
@@ -31,17 +31,17 @@ <% @issues.each do |issue| %> - - + + - +
<%= t ".status" %>
<%= t "issues.states.#{issue.status}" %><%= link_to t(".reports_count", :count => issue.reports_count), issue %><%= 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.display_name) if issue.reported_user %><%= link_to issue.reported_user.display_name, user_path(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.display_name)), - :time => distance_of_time_in_words_to_now(issue.updated_at), + <%= 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) %> <% else %> - <%= t ".last_updated_time_html", :time => distance_of_time_in_words_to_now(issue.updated_at), + <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), :title => l(issue.updated_at) %> <% end %>