Pluralize old_ controllers

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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 3bef038005e9223adb367e357f7cd1e17b1b2597..6612f069b24d6b01e36c7c6ef814ac36786e834d 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for :heading do %>
 <h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
-<p><%= report_type(@issue.reportable_type) %> : <%= reportable_url(@issue.reportable) %></p>
+<p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="deemphasize">
   <small>
     <%= @issue.assigned_role %>
@@ -11,12 +11,12 @@
   </small>
 </p>
 <p>
-  <%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
+  <%= link_to t('.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
   <% if @issue.may_ignore? %>
-  | <%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post %>
+  | <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %>
   <% end %>
 </p>
-<p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<p><%= link_to t('.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
 <% end %>
 
 <div class="report-related-block">
@@ -40,23 +40,23 @@
     <br/>
   </div>
 
-  <div class="related-block">
-    <h3><%= t ".other_issues_against_this_user" %></h3>
-    <div class="unread-reports">
+  <% if @issue.reported_user %>
+    <div class="related-reports">
+      <h3><%= t ".other_issues_against_this_user" %></h3>
       <% if @related_issues.count > 1 %>
-        <% @related_issues.each do |issue| %>
-          <% if issue.id != @issue.id %>
-            <%= reports_url(issue) %> <br/>
+        <ul>
+          <% @related_issues.each do |issue| %>
+            <% if issue.id != @issue.id %>
+              <li><%= link_to reportable_title(issue.reportable), issue %></li>
+            <% end %>
           <% end %>
-        <% end %>
+        </ul>
       <% else %>
         <p><%= t ".no_other_issues" %></p>
       <% end %>
     </div>
-  </div>
+  <% end %>
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
-<div class="unread-reports">
-  <%= render 'comments', comments: @comments %>
-</div>
+<%= render 'comments', comments: @comments %>