SONAR-6026 apply feedback

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 a965e7dd336e3530d1a50131665c2410b650fc6d..bd32fb74fb95eef7ba2e987098cc423b1ae90005 100644 (file)
--- 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,6 +2,7 @@
    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 769ec03a3bc4b940c6cd2d89fa9349273bf0aaa6..c73cefa4d449279cfc276778b593cb26a73344e6 100644 (file)
--- 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,6 +2,9 @@
    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 165cb6727c572a8ef2fd59848b7f760defdf907c..e5f0b6ff0b5e4365bca7ff0822220a396dbd6473 100644 (file)
--- 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,6 +1,7 @@
 <%
     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)

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 cc81f5cba0c639f038f1dc95e552dbdac9e6ae52..782472f45759853d68f5951658a6240cf39d7397 100644 (file)
--- 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,6 +6,7 @@
 
    issues_search_options = {}
    issues_search_options['resolved'] = 'false'
+   issues_search_options['componentUuids'] = @project.uuid
 %>
 <table width="100%">
   <tr>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 506bbf24bdceebafbb37f20f5e807f73e39278dc..3ec5c8606369d3981d0b921d8c6f640456f7168b 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -1052,9 +1052,11 @@ module ApplicationHelper
     else
       url = ApplicationController.root_context + '/component_issues/index?id=' + url_encode(component.key) + '#'
       params.each_with_index do |(key, value), index|
-        url += key.to_s + '=' + value.to_s
-        if index < params.size - 1
-          url += '|'
+        if key != 'componentUuids'
+          url += key.to_s + '=' + value.to_s
+          if index < params.size - 1
+            url += '|'
+          end
         end
       end
       url