SONAR-6026 Migrate calls to search from widgets to use the new parameters

5 files changed, 7 insertions, 14 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb
index cde60847674..75553d3de15 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/action_plans.html.erb
@@ -71,9 +71,8 @@
                    search_options = {}
                    search_options['actionPlans'] = plan.key
                    search_options['resolved'] = false
-                   search_options['componentUuids'] = @project.uuid
                 %>
-              <a href="<%= url_for_issues(search_options) -%>"
+              <a href="<%= url_for_component_issues(@project, search_options) -%>"
                  title="<%= message('widget.action_plans.x_unresolved_issues', :params => unresolved_issues_size.to_s) -%>"><%= unresolved_issues_size -%></a>
             <% end %>
           </td>
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
index bd32fb74fb9..a965e7dd336 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
@@ -2,7 +2,6 @@
    if has_role?(:user, @project)
 
      search_options = {}
-     search_options['componentUuids'] = @project.uuid
      search_options['resolutions'] = 'FALSE-POSITIVE'
      title = message('widget.false_positive_reviews.name')
 %>
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
index c73cefa4d44..769ec03a3bc 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
@@ -2,9 +2,6 @@
    if current_user && (!@project || has_role?(:user, @project))
 
      search_options = {}
-     if @project
-       search_options['componentUuids'] = @project.uuid
-     end
      search_options['resolved'] = 'false'
      search_options['assignees'] = current_user.login
 
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
index 99252fe3281..165cb6727c5 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
@@ -1,7 +1,6 @@
 <%
     options = {}
     options['resolved'] = 'false'
-    options['componentUuids'] = @project.uuid
     if @dashboard_configuration.selected_period?
       options['createdAfter'] = Api::Utils.format_datetime(@dashboard_configuration.from_datetime)
       options['createdBefore'] = Api::Utils.format_datetime(DateTime.now)
@@ -48,7 +47,7 @@
       %>
         <tr class="<%= cycle 'even', 'odd', :name => (div_id) -%>">
           <td class="max-width">
-            <%= link_to users_by_login[assignee].name(), url_for_issues(options.merge(:assignees => assignee)) -%>
+            <%= link_to users_by_login[assignee].name(), url_for_component_issues(@project, options.merge(:assignees => assignee)) -%>
           </td>
           <td class="nowrap">
             <%= '+' if @dashboard_configuration.selected_period? -%><%= count.to_s -%>
@@ -65,7 +64,7 @@
       %>
         <tr class="<%= cycle 'even', 'odd', :name => (div_id) -%>">
           <td class="max-width">
-            <%= link_to message('widget.reviews_per_developer.not_assigned'), url_for_issues(options.merge(:assigned => 'false')) -%>
+            <%= link_to message('widget.reviews_per_developer.not_assigned'), url_for_component_issues(@project, options.merge(:assigned => 'false')) -%>
           </td>
           <td class="nowrap">
             <%= '+' if @dashboard_configuration.selected_period? -%><%= counter_no_assignee.to_s -%>
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
index 17caca037a2..cc81f5cba0c 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
@@ -6,7 +6,6 @@
 
    issues_search_options = {}
    issues_search_options['resolved'] = 'false'
-   issues_search_options['componentUuids'] = @project.uuid
 %>
 <table width="100%">
   <tr>
@@ -15,7 +14,7 @@
         <h3><%= message('issues') -%></h3>
         <div class="marginbottom10">
           <span class="big">
-            <%= format_measure(issues, :url => url_for_issues(issues_search_options)) -%>
+            <%= format_measure(issues, :url => url_for_component_issues(@project, issues_search_options)) -%>
           </span>
           <%= dashboard_configuration.selected_period? ? format_variation(issues) : trend_icon(issues) -%>
         </div>
@@ -26,7 +25,7 @@
         <h3><%= message('issue.status.OPEN') -%></h3>
         <div class="marginbottom10">
           <span class="big">
-            <%= format_measure(open_issues, :url => url_for_issues(issues_search_options.merge(:statuses => 'OPEN'))) -%>
+            <%= format_measure(open_issues, :url => url_for_component_issues(@project, issues_search_options.merge(:statuses => 'OPEN'))) -%>
           </span>
           <%= dashboard_configuration.selected_period? ? format_variation(open_issues) : trend_icon(open_issues) -%>
         </div>
@@ -37,7 +36,7 @@
         <h3><%= message('issue.status.REOPENED') -%></h3>
         <div class="marginbottom10">
           <span class="big">
-            <%= format_measure(reopened_issues, :url => url_for_issues(issues_search_options.merge(:statuses => 'REOPENED'))) -%>
+            <%= format_measure(reopened_issues, :url => url_for_component_issues(@project, issues_search_options.merge(:statuses => 'REOPENED'))) -%>
           </span>
           <%= dashboard_configuration.selected_period? ? format_variation(reopened_issues) : trend_icon(reopened_issues) -%>
         </div>
@@ -48,7 +47,7 @@
         <h3><%= message('issue.status.CONFIRMED') -%></h3>
         <div class="marginbottom10">
           <span class="big">
-            <%= format_measure(confirmed_issues, :url => url_for_issues(issues_search_options.merge(:statuses => 'CONFIRMED'))) -%>
+            <%= format_measure(confirmed_issues, :url => url_for_component_issues(@project, issues_search_options.merge(:statuses => 'CONFIRMED'))) -%>
           </span>
           <%= dashboard_configuration.selected_period? ? format_variation(confirmed_issues) : trend_icon(confirmed_issues) -%>
         </div>