X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b5e0d91f3c98e593f939225646f60f246af27f0..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/issues/index.html.erb diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 56de810c2..1c45f4124 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -4,42 +4,47 @@ <%= form_tag(issues_path, :method => :get) do %>

<%= t ".search_guidance" %>

-<%= select :status, nil, [['open', 0], ['resolved', 2], ['ignored', 1]], { :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") %> +<%= 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 %> -
+
- +
- - - - - - - + + + + + <% @issues.each do |issue| %> - - - - - - - + + + + + <% end %>
<%= 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" %><%= t ".status" %><%= t ".reports" %><%= t ".reported_item" %><%= t ".reported_user" %><%= t ".last_updated" %>
<%= issue.status.humanize %><%= 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.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %><%= instance_url(issue.reportable) %><%= 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 %> + <% 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) %> + <% 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) %> + <% end %> +