Rename 'issue_type' to 'assigned_role', set defaults in the model and test.

[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 12cd79b376459fb86af7b7f1efaa8df1ab3653b3..521b53ec0e09c23716b755b4d9a0bd308e1732f0 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,47 +1,46 @@
-<p id= "notice"><%= notice %></p>
-

 <% content_for :heading do %>
 <% 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 %>
 <% 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" %>
+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/>
 <% end %>
 <br/>

+
+<% if @issues.length == 0 %>
+  <p><%= t ".search.issues_not_found" %></p>
+<% end %>
+

 <br/>
 
 <table>
 <br/>
 
 <table>

-       <thead>
-               <tr>
-                       <tr>
-                               <td><b> <%= sortable("status") %></b></td>
-                               <td><b> <%= sortable("report_count", "Number of Reports") %></b></td>
-                               <td><b> <%= sortable("updated_at","Last updated at") %></b></td>
-                               <td><b> <%= sortable("updated_by","Last updated by") %></b></td>
-                               <td><b> Link to reports </b></td>
-                               <td><b> <%= sortable("reported_user_id","Reported User") %> </b></td>
-                               <td><b> Link to reported instance</b></td>
-                       </tr>
-               </tr>
-       </thead>
-       <tbody>
-               <% @issues.each do |issue| %>
-                       <tr>
-                               <td><%= issue.status.humanize %></td>
-                               <td><%= 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>
+  <thead>
+    <tr>
+      <td><b>Status</b></td>
+      <td><b>Number of Reports</b></td>
+      <td><b>Last updated at</b></td>
+      <td><b>Last updated by</b></td>
+      <td><b>Link to reports</b></td>
+      <td><b>Reported User</b></td>
+      <td><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.reports_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>
 </table>

-
-