X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bd06529c7f9920c4f71498277f453bf1b8dd030..7f611b295f39b8c42219a5ce6c84582db74ce8f7:/app/views/issues/index.html.erb diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 4b7a2de50..95dfbf6f2 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -2,45 +2,42 @@

<%= t ".title" %>

<% end %> -<%= form_tag(issues_path, :method => :get) do %>

<%= t ".search_guidance" %>

-<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :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") %> -<% end %> -
-<% if @issues.length == 0 %> -

<%= t ".issues_not_found" %>

+<%= form_tag(issues_path, :method => :get, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" }) 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" %> +
+
<% 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 "issues.states.#{issue.status}" %><%= issue.reports_count %><%= l(issue.updated_at.to_datetime, :format => :friendly) %><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %><%= link_to reportable_title(issue.reportable), issue %><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %><%= link_to t(".show_instance"), reportable_url(issue.reportable) %>
+<%= render :partial => "page" %>