Merge remote-tracking branch 'upstream/pull/4200'

[rails.git] / app / views / issues / index.html.erb

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 0aa9fea503f1aa75e1c8df7b824ee816517565d5..3f79190fae1ae09f6392934741e604d76c73f9e0 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -4,73 +4,40 @@
 
 <p><%= t ".search_guidance" %></p>
 
 
 <p><%= t ".search_guidance" %></p>
 

-<%= form_tag(issues_path, :method => :get) do %>
-  <div class="form-row">
-    <div class="form-group col-md-auto">
+<%= form_tag(issues_path, :method => :get, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" }) do %>
+  <div class="row gx-1">
+    <div class="mb-3 col-md-auto">

       <%= 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 :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-control custom-select" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md-auto">
+    <div class="mb-3 col-md-auto">

       <%= select_tag :issue_type,
       <%= select_tag :issue_type,

-                     options_for_select(@issue_types, params[:issue_type]),
+                     options_for_select(@issue_types.map { |issue_type| [issue_type.constantize.model_name.human, issue_type] }, params[:issue_type]),

                      :include_blank => t(".select_type"),
                      :data => { :behavior => "category_dropdown" },
                      :include_blank => t(".select_type"),
                      :data => { :behavior => "category_dropdown" },

-                     :class => "form-control custom-select" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md">
+    <div class="mb-3 col-md">

       <%= text_field_tag :search_by_user,
                          params[:search_by_user],
                          :placeholder => t(".reported_user"),
       <%= text_field_tag :search_by_user,
                          params[:search_by_user],
                          :placeholder => t(".reported_user"),

+                         :autocomplete => "on",

                          :class => "form-control" %>
     </div>
                          :class => "form-control" %>
     </div>

-    <div class="form-group col-md-auto">
+    <div class="mb-3 col-md-auto">

       <%= 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" },
       <%= 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-control custom-select" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md-auto">
+    <div class="mb-3 col-md-auto">

       <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
     </div>
   </div>
 <% end %>
 
       <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
     </div>
   </div>
 <% end %>
 

-<% if @issues.length == 0 %>
-  <p><%= t ".issues_not_found" %></p>
-<% else %>
-  <table class="table table-sm">
-    <thead>
-      <tr>
-        <th><%= t ".status" %></th>
-        <th><%= t ".reports" %></th>
-        <th><%= t ".reported_item" %></th>
-        <th><%= t ".reported_user" %></th>
-        <th><%= t ".last_updated" %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @issues.each do |issue| %>
-        <tr>
-          <td><%= t ".states.#{issue.status}" %></td>
-          <td class="text-nowrap"><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
-          <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
-          <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
-          <td>
-            <% 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 %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
+<%= render :partial => "page" %>