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

[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 05ce1b9f1f149c047b0b39048b55b8e6d1c9af51..3e2f5ef488e34202519d9fe760e6191c14f12216 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,22 +1,22 @@
 <% content_for :heading do %>
 <h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
 <% content_for :heading do %>
 <h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>

-<p><%= @issue.reportable.model_name.human %> : <%= 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 %>
     | <%= t ".reports", :count => @issue.reports.count %>
     | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
 <p class="deemphasize">
   <small>
     <%= @issue.assigned_role %>
     | <%= t ".reports", :count => @issue.reports.count %>
     | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>

-    <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format =>:friendly)) if @issue.resolved_at? %>
-    <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name ) if @issue.user_updated %>
+    <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly)) if @issue.resolved_at? %>
+    <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name) if @issue.user_updated %>

   </small>
 </p>
 <p>
   </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? %>
   <% 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>
   <% 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">
 <% end %>
 
 <div class="report-related-block">


@@ -27,36 +27,36 @@
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>

-      <%= render 'reports', reports: @read_reports %>
+      <%= render "reports", :reports => @read_reports %>

     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>

-      <%= render 'reports', reports: @unread_reports %>
+      <%= render "reports", :reports => @unread_reports %>

     </div>
     <% end %>
     </div>
     <% end %>

-    <br/>
+    <br />

   </div>
 
   </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 %>
       <% 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 %>

-        <% end %>
+        </ul>

       <% else %>
         <p><%= t ".no_other_issues" %></p>
       <% end %>
     </div>
       <% else %>
         <p><%= t ".no_other_issues" %></p>
       <% end %>
     </div>

-  </div>
+  <% end %>

 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>

-<div class="unread-reports">
-  <%= render 'comments', comments: @comments %>
-</div>
+<%= render "comments", :comments => @comments %>