SONAR-3926 Incorrect links to violations in Violations Drilldown

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_rules.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_rules.html.erb
index dc057cf5dbe1c75eaf99f5bc64b01c83add2a3d0..b0d32203c10a66500a26ce872ae32413f8882735 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_rules.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_rules.html.erb
@@ -32,7 +32,7 @@
 
 <div class="line-block">
   <div style="float:right">
-    <a href="#" onclick="window.location.href='<%= url_for(:controller => 'drilldown', :action => 'violations') -%>?id=<%= @resource.key -%>&period=<%= dashboard_configuration.period_index -%>&severity=' + $F('select-severity_<%= widget.id -%>') ">
+    <a href="#" onclick="window.location.href='<%= url_for(:controller => 'drilldown', :action => 'violations') -%>/<%= @resource.id -%>?period=<%= dashboard_configuration.period_index -%>&severity=' + $F('select-severity_<%= widget.id -%>') ">
       <%= message('widget.hotspot_metric.more') -%>
     </a>
   </div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb
index 0703dd90da9ad1eaf6de08e1cd6fd25ae829fe96..f03b06a1c01074ed492266d26bf57b9dfbfbdead 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb
@@ -2,7 +2,7 @@
 <tr class="<%= css -%> <%= 'selected' if selected -%>">
        <td><%= image_tag "priority/#{severity}.png" %></td>
   <td>
-    <%= link_to message("severity.#{severity}"), {:controller => 'drilldown', :action => 'violations', :id => @resource.id, :severity => (selected ? nil : severity), :period => @period} %>
+    <%= link_to message("severity.#{severity}"), {:controller => :drilldown, :action => :violations, :id => @resource.id, :severity => (selected ? nil : severity), :period => @period} %>
   </td>
   <td style="padding-left: 10px;" align="right" nowrap>
          <%= @period ? format_variation(measure, :index => @period, :style => 'light') : format_measure(measure) -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
index 79346c11dbc8eafb0b06c84611dac3894108713c..6dc520c94fffd586fe61de8781a060bef6d470de 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
@@ -94,7 +94,7 @@
                 <a id="<%= "rule#{rule_index}" -%>" title="<%= message('violations_drilldown.click_for_more_on_x', :params => [rule.plugin_name, rule.plugin_rule_key]) -%>" onclick="window.open(this.href,'rule','height=800,width=900,scrollbars=1,resizable=1');return false;" href="<%= url_for :controller => 'rules', :action => 'show', :id => rule.key, :layout => 'false' -%>"><img src="<%= ApplicationController.root_context -%>/images/priority/<%= rule_measure.rule_priority -%>.png"/></a>
               </td>
               <td>
-                <%= link_to(rule.name, {:rule => (selected ? nil : rule.key), :rule_sev => (selected ? nil : rule_measure.severity), :sid => nil, :severity => @severity, :period => @period, :rids => (selected ? nil : @selected_rids)}, :title => "#{rule.plugin_name}: #{rule.plugin_rule_key}") -%>
+                <%= link_to(rule.name, {:controller => :drilldown, :action => :violations, :id => @resource.id, :rule => (selected ? nil : rule.key), :rule_sev => (selected ? nil : rule_measure.severity), :sid => nil, :severity => @severity, :period => @period, :rids => (selected ? nil : @selected_rids)}, :title => "#{rule.plugin_name}: #{rule.plugin_rule_key}") -%>
               </td>
               <td class="right" nowrap="nowrap">
                 <span><%= @period ? format_variation(rule_measure, :period => @period, :style => 'light') : rule_measure.formatted_value -%></span>