X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3276063fcfba982b7bbb886f5ef18d7ae67c46f5..0b7435ab32b3271ae000894f6798cc087b3c058c:/app/views/issues/index.html.erb?ds=inline diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 6c72dcc12..523f90846 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,46 +1,75 @@ <% content_for :heading do %> -

List of <%= @user_role %> issues:

+

<%= t ".title" %>

<% end %> +

<%= t ".search_guidance" %>

+ <%= 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" %> +
+
+ <%= 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" %> +
+
<% end %> -
<% if @issues.length == 0 %> -

<%= t ".search.issues_not_found" %>

-<% end %> - -
- - - - - - - - - - - - - - - <% @issues.each do |issue| %> +

<%= t ".issues_not_found" %>

+<% else %> +
StatusNumber of ReportsLast updated atLast updated byLink to reportsReported UserLink to reported instance
+ - - - - - - - + + + + + - <% end %> - -
<%= 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 ".status" %><%= t ".reports" %><%= t ".reported_item" %><%= t ".reported_user" %><%= t ".last_updated" %>
+ + + <% @issues.each do |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, issue.reported_user if issue.reported_user %> + + <% if issue.user_updated %> + <%= 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 %> + <%= friendly_date_ago(issue.updated_at) %> + <% end %> + + + <% end %> + + +<% end %>