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

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

diff --git a/app/views/issues/_page.html.erb b/app/views/issues/_page.html.erb
index 2c0340c1108d7fd908f0790f307ff7529839060b..b46b1798c96e2d3723b09065b947ace78208d20f 100644 (file)
--- a/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@ -1,36 +1,44 @@
 <turbo-frame id="pagination" target="_top">
 <turbo-frame id="pagination" target="_top">

-  <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| %>
+  <% if @issues.length == 0 %>
+    <% if params[:search_by_user].present? && !@find_user %>
+      <p><%= t ".user_not_found" %></p>
+    <% else %>
+      <p><%= t ".issues_not_found" %></p>
+    <% end %>
+  <% else %>
+    <table class="table table-sm">
+      <thead>

         <tr>
         <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, issue.reported_user if issue.reported_user %></td>
-          <td>
-            <% 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 %>
-          </td>
+          <th><%= t ".status" %></th>
+          <th><%= t ".reports" %></th>
+          <th><%= t ".reported_item" %></th>
+          <th><%= t ".reported_user" %></th>
+          <th><%= t ".last_updated" %></th>

         </tr>
         </tr>

-      <% end %>
-    </tbody>
-  </table>
-  <%= render "shared/pagination",
-             :newer_key => "issues.page.newer_issues",
-             :older_key => "issues.page.older_issues",
-             :newer_id => @newer_issues_id,
-             :older_id => @older_issues_id %>
+      </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, issue.reported_user if issue.reported_user %></td>
+            <td>
+              <% 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 %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+    <%= render "shared/pagination",
+               :newer_key => "issues.page.newer_issues",
+               :older_key => "issues.page.older_issues",
+               :newer_id => @newer_issues_id,
+               :older_id => @older_issues_id %>
+  <% end %>

 </turbo-frame>
 </turbo-frame>