X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f72c34aaf85b736a2d4b880886ca84f490b28ba0..916f2c9036d280d1de451e35847d8b37c6550109:/app/views/issues/index.html.erb

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 4002e9db3..340f5ab9b 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,11 +1,15 @@
 <p id= "notice"><%= notice %></p>
 
 <% content_for :heading do %>
-	<h1>List of <%= @user_role %> issues:</h1>
+	<h1>List of <%= @user_role %> issues:</h1> 
 <% end %>
 
 <%= form_tag(issues_path, :method => :get) do %>
-	<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Search by Reported User" %>
+	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" %>
 <% end %>
 <br/>
@@ -15,26 +19,26 @@
 	<thead>
 		<tr>
 			<tr>
-				<td style="text-align:center"><b> # </b> </td>
-				<td style="text-align:center"><b>Issue Type </b></td>
-				<td style="text-align:center"><b> Status </b></td>
-				<td style="text-align:center"><b> Number of Reports</b></td>
-				<td style="text-align:center"><b> Link to instance </b></td>
-				<td style="text-align:center"><b> Reported User </b></td>
-				<td style="text-align:center"></td>
+				<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>
 		</tr>
 	</thead>
 	<tbody>
 		<% @issues.each do |issue| %>
 			<tr>
-				<td style="text-align:center">Issue #<%= issue.id %> </td>
-				<td style="text-align:center"> <%= issue.reportable_type %></td>
-				<td style="text-align:center"><span class="count-number"> <strong><%= issue.status %></strong></span> </td>
-				<td style="text-align:center"><%= issue.reports.count %></td>
-				<td style="text-align:center"> <%= reportable_url(issue.reportable) %></td>
-				<td style="text-align:center"><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
-				<td style="text-align:center"><%= link_to "Show Issue", issue %></td>
+				<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.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
+				<td><%= instance_url(issue.reportable) %></td>
 			</tr>
 		<% end %>
 	</tbody>