Create last managing user column in issues table

[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 b46b1798c96e2d3723b09065b947ace78208d20f..a1279cb9703178f13cc4706898d7a967b77fc595 100644 (file)
--- a/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@ -13,7 +13,9 @@
           <th><%= t ".reports" %></th>
           <th><%= t ".reported_item" %></th>
           <th><%= t ".reported_user" %></th>
           <th><%= t ".reports" %></th>
           <th><%= t ".reported_item" %></th>
           <th><%= t ".reported_user" %></th>

+          <th class="reporting_users"><%= t ".reporting_users" %></th>

           <th><%= t ".last_updated" %></th>
           <th><%= t ".last_updated" %></th>

+          <th><%= t ".last_managed" %></th>

         </tr>
       </thead>
       <tbody>
         </tr>
       </thead>
       <tbody>


@@ -23,21 +25,25 @@
             <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 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) %>
+            <td class="reporting_users text-truncate">
+              <% @unique_reporters[issue.id][:users].each do |reporter| %>
+                <%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
+              <% end %>
+              <% if @unique_reporters[issue.id][:count] > 3 %>
+                <p class="m-0"><%= t ".more_reporters", :count => @unique_reporters[issue.id][:count] - 3 %></p>

               <% end %>
             </td>
               <% end %>
             </td>

+            <td>
+              <%= friendly_date_ago(issue.updated_at) %>
+            </td>
+            <td>
+              <%= link_to(issue.user_updated.display_name, issue.user_updated) if issue.user_updated %>
+            </td>

           </tr>
         <% end %>
       </tbody>
     </table>
     <%= render "shared/pagination",
           </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 %>
                :newer_id => @newer_issues_id,
                :older_id => @older_issues_id %>
   <% end %>