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

[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 0eb2108b903072d117d7c49670cb6d525a90fed6..3f79190fae1ae09f6392934741e604d76c73f9e0 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,43 +1,43 @@
-<p id= "notice"><%= notice %></p>
-

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1>List of <%= @user_role %> issues:</h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% end %>
 

-<%= form_tag(issues_path, :method => :get) do %>
-Search for a particular issue(s):  <br/>
-<%= 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" %>
+<p><%= t ".search_guidance" %></p>
+
+<%= 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" },
+                     :class => "form-select" %>
+    </div>
+    <div class="mb-3 col-md-auto">
+      <%= select_tag :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" },
+                     :class => "form-select" %>
+    </div>
+    <div class="mb-3 col-md">
+      <%= text_field_tag :search_by_user,
+                         params[:search_by_user],
+                         :placeholder => t(".reported_user"),
+                         :autocomplete => "on",
+                         :class => "form-control" %>
+    </div>
+    <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" },
+                     :class => "form-select" %>
+    </div>
+    <div class="mb-3 col-md-auto">
+      <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
+    </div>
+  </div>

 <% end %>
 <% end %>

-<br/>
-<br/>

 
 

-<table>
-  <thead>
-    <tr>
-      <td style="width:40px;"><b> <%= sortable("status") %></b></td>
-      <td style="width:160px;"><b> <%= sortable("report_count", "Number of Reports") %></b></td>
-      <td style="width:141px;"><b> <%= sortable("updated_at","Last updated at") %></b></td>
-      <td style="width:140px;"><b> <%= sortable("updated_by","Last updated by") %></b></td>
-      <td style="width:203px;"><b> Link to reports </b></td>
-      <td style="width:128px;"><b> <%= sortable("reported_user_id","Reported User") %> </b></td>
-      <td style="width:67px;"><b> Link to reported instance</b></td>
-    </tr>
-  </thead>
-  <tbody>
-    <% @issues.each do |issue| %>
-      <tr>
-        <td><%= issue.status.humanize %></td>
-        <td style="text-align:center;"><%= issue.report_count %></td>
-        <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
-        <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
-        <td><%= reports_url(issue) %></td>
-        <td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
-        <td><%= instance_url(issue.reportable) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= render :partial => "page" %>