X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ed84930283982062753e8fbd7323239d70dd1611..d8a1cbd27bcaeba879662f26f91efd0e76bb1f1f:/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 12cd79b37..1f3ca3118 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,47 +1,51 @@ -

<%= notice %>

- <% content_for :heading do %> -

List of <%= @user_role %> issues:

+

<%= t ".title" %>

<% end %> <%= form_tag(issues_path, :method => :get) do %> - Search for a particular issue(s):
- <%= select :status, nil, [['open', 0],['resolved',2],['ignored',1]],{:include_blank => "Select status"},data: { behavior: 'category_dropdown' } %> - <%= select :issue_type, nil, @issue_types,{:include_blank => "Select type"}, data: { behavior: 'category_dropdown' } %> - <%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Reported User" %> - <%= select :last_reported_by, nil, @users.all.collect {|f| [f.display_name, f.id]} << ['Not updated',"nil"], {:include_blank => "Select last updated by"}, data: { behavior: 'category_dropdown' } %> - <%= submit_tag "Search" %> +

<%= t ".search_guidance" %>

+<%= 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 %> -
-
+
- - - - - - - - - - - - - - - - <% @issues.each do |issue| %> - - - - - - - - - - <% 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
<%= issue.status.humanize %><%= issue.report_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) %>
+<% if @issues.length == 0 %> +

<%= t ".issues_not_found" %>

+<% end %> +
+ + + + + + + + + + + + <% @issues.each do |issue| %> + + + + + + + + <% end %> + +
<%= t ".status" %><%= t ".reports" %><%= t ".reported_item" %><%= t ".reported_user" %><%= t ".last_updated" %>
<%= 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 %> +