SONAR-6026 Migrate issue related widgets to new search parameter

5 files changed, 7 insertions, 27 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 18fe4e3c186..cde60847674 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,11 +71,7 @@
                    search_options = {}
                    search_options['actionPlans'] = plan.key
                    search_options['resolved'] = false
-                   if @project.qualifier == 'TRK'
-                     search_options['projectUuids'] = @project.uuid
-                   else
-                     search_options['componentRootUuids'] = @project.uuid
-                   end
+                   search_options['componentUuids'] = @project.uuid
                 %>
               <a href="<%= url_for_issues(search_options) -%>"
                  title="<%= message('widget.action_plans.x_unresolved_issues', :params => unresolved_issues_size.to_s) -%>"><%= unresolved_issues_size -%></a>
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 0a33fb66901..bd32fb74fb9 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,11 +2,7 @@
    if has_role?(:user, @project)
 
      search_options = {}
-     if @project.qualifier == 'TRK'
-       search_options['projectUuids'] = @project.uuid
-     else
-       search_options['componentRootUuids'] = @project.uuid
-     end
+     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 6ff8884370c..c73cefa4d44 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
@@ -3,20 +3,16 @@
 
      search_options = {}
      if @project
-       if @project.qualifier == 'TRK'
-         search_options['projectUuids'] = @project.uuid
-       else
-         search_options['componentRootUuids'] = @project.uuid
-       end
+       search_options['componentUuids'] = @project.uuid
      end
      search_options['resolved'] = 'false'
      search_options['assignees'] = current_user.login
-     
+
      title = message('widget.my_reviews.name')
 %>
 
   <%= render :partial => 'project/widgets/issues/issues_list_widget',
-             :locals => {:search_options => search_options, :title => title, 
+             :locals => {:search_options => search_options, :title => title,
                          :widget_id => widget.id.to_s, :widget_properties => widget_properties} %>
 
 <% end %>
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 bfae944e337..99252fe3281 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,11 +1,7 @@
 <%
     options = {}
     options['resolved'] = 'false'
-    if @project.qualifier == 'TRK'
-      options['projectUuids'] = @project.uuid
-    else
-      options['componentRootUuids'] = @project.uuid
-    end
+    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)
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 f620dcbe4e9..17caca037a2 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,11 +6,7 @@
 
    issues_search_options = {}
    issues_search_options['resolved'] = 'false'
-   if @project.qualifier == 'TRK'
-    issues_search_options['projectUuids'] = @project.uuid
-   else
-     issues_search_options['componentRootUuids'] = @project.uuid
-   end
+   issues_search_options['componentUuids'] = @project.uuid
 %>
 <table width="100%">
   <tr>