From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 24 Mar 2016 16:42:40 +0000 (+0100)
Subject: SONAR-7473 Drop 'reporter' field from issue filter widgets
X-Git-Tag: 5.5-M12~50
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f661a14e2a03a44a9adfe18bb55f76754c9eabda;p=sonarqube.git

SONAR-7473 Drop 'reporter' field from issue filter widgets
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java
index fc9ccacf4c2..da507e8e22f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java
@@ -32,7 +32,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL;
 @WidgetProperties({
   @WidgetProperty(key = IssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false),
   @WidgetProperty(key = IssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities",
-    options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters",
+    options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees",
       "authors", "languages", "createdAt"}),
   @WidgetProperty(key = IssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"),
   @WidgetProperty(key = IssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"})
diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java
index ea6b0fcfe5b..bdb362d8905 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java
@@ -32,7 +32,7 @@ import static org.sonar.api.web.WidgetScope.PROJECT;
 @WidgetProperties({
   @WidgetProperty(key = ProjectIssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false),
   @WidgetProperty(key = ProjectIssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities",
-    options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors",
+    options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "assignees", "authors",
       "languages", "createdAt"}),
   @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"),
   @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"})
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
index c228268bc23..235a9fb3017 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
+++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/issue_filter.html.erb
@@ -14,9 +14,15 @@
     <% @widget_title = "<a href=\"#{url_for({:controller => 'issues', :action => 'index'})}#id=#{filter.id}|#{filter.data}|facetMode=#{display_mode}\">#{h(filter.name)}</a>" %>
     <% if widget_properties['displayFilterDescription'] && !filter.description.blank? %>
       <p class="note spacer-bottom"><%= h filter.description -%></p>
+      werwer
     <% end %>
 
     <div id="<%= container_id -%>"></div>
+
+    <% if distribution_axis == 'reporters' %>
+      <p class="note spacer-bottom">The distribution by rReporter is no more supported. Please update this widget.</p>
+    <% end %>
+
     <script>
       jQuery(function () {
         var query = '<%= filter.data -%>';
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb
index 85ba4786417..0c663b6d778 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb
+++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/project_issue_filter.html.erb
@@ -23,6 +23,11 @@
     <% end %>
 
     <div id="<%= container_id -%>"></div>
+
+    <% if distribution_axis == 'reporters' %>
+      <p class="note spacer-bottom">The distribution by rReporter is no more supported. Please update this widget.</p>
+    <% end %>
+
     <script>
       jQuery(function () {
         var query = '<%= filter.data -%>';