SONAR-3755 Display resolution and status in issues source viewer

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index 946a8217a745025d6071c0d3b83dcb4a830ef8c3..bf2e8fc1c74996f53da35c6e3d7a4c5c97f0be3d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -28,7 +28,7 @@
       </td>
       <td class="val">
         <%= image_tag "status/#{@issue.status}.png" -%> <span class="reviewStatus<%= @issue.status -%>"><%= message("issues.status.#{@issue.status}") -%></span>
-        <% if @issue.resolution.present? %>
+        <% if @issue.resolution.present? && !@issue.resolution == 'OEPN' %>
           (<span class="reviewResolution<%= @issue.resolution -%>"><%= message("issues.resolution.#{@issue.resolution}") -%></span>)
         <% end %>
       </td>
@@ -92,7 +92,7 @@
           <%= @resource.long_name -%> <%= image_tag 'sep12.png' -%>
         <% end %>
         <% if @component.last_snapshot %>
-          <%= link_to_resource(@component, @component.long_name, {:tab => :violations, :rule => @issue.resolution == "FALSE-POSITIVE" ? "false_positive_issues" : ""}) %>
+          <%= link_to_resource(@component, @component.long_name, {:tab => :issues, :rule => @issue.resolution == "FALSE-POSITIVE" ? "false_positive_issues" : ""}) %>
         <% else %>
           <%= @component.long_name -%>
         <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
index 0aaee8410bd8fb20e9b4bd95f4cc31532bd8dcac..22d717c3c337eccc3038ca4042d7db78523a7e35 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_issue.html.erb
@@ -21,28 +21,22 @@
       <%= image_tag 'sep12.png' -%>
       &nbsp;
 
-      <% if issue.created_at %>
-        <span><%= distance_of_time_in_words_to_now(to_date(issue.created_at)) -%></span>
-        &nbsp;
-      <% end %>
+      <span><%= distance_of_time_in_words_to_now(to_date(issue.created_at)) -%></span>
+      &nbsp;
       <%
-         # TODO
-         #if violation.switched_off?
-         if false
+         if issue.resolution == 'FALSE-POSITIVE'
       %>
         <%= image_tag 'sep12.png' -%>
         &nbsp;
-        <span class="falsePositive"><%= message('false_positive') -%></span>
+        <span class="reviewResolution<%= issue.resolution %>"><%= message("issues.resolution.#{issue.resolution}") -%></span>
         &nbsp;
       <% end %>
       <%
-         # TODO
-         #if violation.review && violation.review.resolved?
-         if false
+         if issue.status == 'RESOLVED'
       %>
         <%= image_tag 'sep12.png' -%>
         &nbsp;
-        <span class="reviewResolved"><%= message('reviews.status.RESOLVED') -%></span>
+        <span class="reviewStatus<%= issue.status -%>"><%= message("issues.status.#{issue.status}") -%></span>
         &nbsp;
       <% end %>
       <%