Issue reopens on Reports coming in after instance update

[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 d756595cf9335f6123c908cf6a660a2055923336..1f57c454e73a62babb9d18a9f3e1a4cceff2c8b5 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -4,26 +4,54 @@
        <p>Issue type: <%= @issue.reportable_type %></p>
        <p class="deemphasize">
                <small>
        <p>Issue type: <%= @issue.reportable_type %></p>
        <p class="deemphasize">
                <small>

-                       <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %> | <%= "Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved? %>
+                       <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %>  <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %>

                </small>
        </p>
                </small>
        </p>

-       <p><%= link_to "Resolve", resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
-       <p><%= link_to "Ignore", ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
-       <p><%= link_to "Reopen", reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+       <p><%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
+       <p><%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
+       <p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>

 <% end %>
 
 <% end %>
 

-<h3>Reports under this issue:</h3>
+<div class="report-related-block">

 
 

-<% if @read_reports.present? %>
-       <div class="read-reports">
-               <h4>Read Reports:</h4>
-               <%= render 'reports',reports: @read_reports %>
+       <div class="report-block">
+               <h3>Reports under this issue:</h3>
+
+               <% if @read_reports.present? %>
+                       <div class="read-reports">
+                               <h4>Read Reports:</h4>
+                               <%= render 'reports',reports: @read_reports %>
+                       </div>
+               <% end %>       
+
+               <% if @unread_reports.any? %>
+                       <div class="unread-reports">
+                               <h4>New Reports:</h4>
+                               <%= render 'reports',reports: @unread_reports %>
+                       </div>
+               <% end %>       
+               <br/>
+       </div>
+
+       <div class="related-block">
+               <h3> Other issues against this user: </h3>
+                       <div class="unread-reports">
+                               <% if @related_issues.count > 1 %>
+                                       <% @related_issues.each do |issue| %>
+                                               <% if issue.id != @issue.id %>
+                                                       <%= link_to "#{issue.reportable_type} ##{issue.reportable_id}", issue %> <br/>
+                                               <% end %>
+                                       <% end %>
+                               <% else %>
+                                       <p>No other reports against this user!</p>
+                               <% end %>
+                       </div>

        </div>
        </div>

-<% end %>      

 
 

-<% if @unread_reports.any? %>
+</div>
+
+<h3>Comments on this issue:</h3>

        <div class="unread-reports">
        <div class="unread-reports">

-               <h4>New Reports:</h4>
-               <%= render 'reports',reports: @unread_reports %>
+               <%= render 'comments', comments: @comments %>

        </div>
        </div>

-<% end %>      
+