From 0a6d2e59e58d0a854a9dd9b5a5915e97ac5a8a49 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 27 May 2013 17:36:15 +0200 Subject: SONAR-4296 Delete ActionPlansWidget on reviews in favor of ActionPlansWidget on issues (same key is now used) --- .../java/org/sonar/plugins/core/CorePlugin.java | 2 - .../core/dashboards/ProjectIssuesDashboard.java | 2 +- .../plugins/core/widgets/ActionPlansWidget.java | 35 -------- .../core/widgets/issues/ActionPlansWidget.java | 2 +- .../main/resources/org/sonar/l10n/core.properties | 11 +-- .../plugins/core/widgets/action_plans.html.erb | 92 ---------------------- .../core/widgets/issues/action_plans.html.erb | 6 +- 7 files changed, 7 insertions(+), 143 deletions(-) delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java delete mode 100644 plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb (limited to 'plugins') diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index ade0e86d442..9791fe5d5ac 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -44,7 +44,6 @@ import org.sonar.plugins.core.timemachine.*; import org.sonar.plugins.core.web.Lcom4Viewer; import org.sonar.plugins.core.web.TestsViewer; import org.sonar.plugins.core.widgets.*; -import org.sonar.plugins.core.widgets.issues.ActionPlansWidget; import org.sonar.plugins.core.widgets.issues.*; import org.sonar.plugins.core.widgets.reviews.ProjectReviewsWidget; @@ -408,7 +407,6 @@ public final class CorePlugin extends SonarPlugin { ProjectReviewsWidget.class, FalsePositiveIssuesWidget.class, ActionPlansWidget.class, - org.sonar.plugins.core.widgets.ActionPlansWidget.class, UnresolvedIssuesPerAssigneeWidget.class, UnresolvedIssuesStatusesWidget.class, NewIssuesEmailTemplate.class, diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java index 444db852088..853fa090f22 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java @@ -46,7 +46,7 @@ public final class ProjectIssuesDashboard extends DashboardTemplate { private void addFirstColumn(Dashboard dashboard) { dashboard.addWidget("unresolved_issues_statuses", 1); - dashboard.addWidget("issues_action_plans", 1); + dashboard.addWidget("action_plans", 1); } private void addSecondColumn(Dashboard dashboard) { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java deleted file mode 100644 index 912a046e04a..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ActionPlansWidget.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2013 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.plugins.core.widgets; - -import org.sonar.api.web.WidgetCategory; -import org.sonar.api.web.WidgetProperties; -import org.sonar.api.web.WidgetProperty; -import org.sonar.api.web.WidgetPropertyType; - -@WidgetCategory({"Action plans", "Reviews"}) -@WidgetProperties({ - @WidgetProperty(key = "showClosedReviews", type = WidgetPropertyType.BOOLEAN, defaultValue = "true") -}) -public class ActionPlansWidget extends CoreWidget { - public ActionPlansWidget() { - super("action_plans", "Action plans", "/org/sonar/plugins/core/widgets/action_plans.html.erb"); - } -} diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java index 6da3c1c362a..652e3a2792a 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/ActionPlansWidget.java @@ -31,6 +31,6 @@ import org.sonar.plugins.core.widgets.CoreWidget; }) public class ActionPlansWidget extends CoreWidget { public ActionPlansWidget() { - super("issues_action_plans", "Issues action plans", "/org/sonar/plugins/core/widgets/issues/action_plans.html.erb"); + super("action_plans", "Issues action plans", "/org/sonar/plugins/core/widgets/issues/action_plans.html.erb"); } } diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index fa054126914..e1024aa9283 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -1066,17 +1066,10 @@ widget.unresolved_issues_statuses.description=Display the number of unresolved i widget.action_plans.name=Action plans widget.action_plans.description=Shows all the open action plans of the project -widget.action_plans.property.showClosedReviews.name=Show Closed Reviews +widget.action_plans.property.showResolvedIssues.name=Show Resolved Issues widget.action_plans.title=Open action plans widget.action_plans.no_action_plan=No action plan -widget.action_plans.x_open_reviews={0} open reviews - -widget.issues_action_plans.name=Issues action plans -widget.issues_action_plans.description=Shows all the open action plans of the project -widget.issues_action_plans.property.showResolvedIssues.name=Show Resolved Issues -widget.issues_action_plans.title=Open action plans -widget.issues_action_plans.no_action_plan=No action plan -widget.issues_action_plans.x_unresolved_issues={0} unresolved issues +widget.action_plans.x_unresolved_issues={0} unresolved issues widget.treemap-widget.name=Treemap of components widget.treemap-widget.description=Displays a treemap of all direct components of the selected resource diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb deleted file mode 100644 index bbd2b41f3c4..00000000000 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/action_plans.html.erb +++ /dev/null @@ -1,92 +0,0 @@ -<% - if has_role?(:user, @project) - open_action_plans = ActionPlan.find(:all, :conditions => ['status= ? AND project_id=?', ActionPlan::STATUS_OPEN, @project.id], - :include => 'reviews', :order => 'deadline ASC') - - div_id = "action-plan-widget-#{widget.id.to_s}" -%> - -
- <% if has_role?(:admin, @project) %> -
- - <%= message('widgets.more') -%> - -
- <% end %> - -

<%= message('widget.action_plans.title') -%>

-
- - -
- -<% if open_action_plans.size ==0 %> - - <%= message('widget.action_plans.no_action_plan') -%> - -<% - else - show_closed_reviews = widget_properties["showClosedReviews"] - if show_closed_reviews - line_class = "top" - else - line_class = "middle" - max_open_reviews = open_action_plans.map {|plan| plan.open_reviews.size}.max - end -%> - - - - - - - - - <% - open_action_plans.each do |plan| - %> - "action_plan_" + widget.id.to_s) -%>"> - - - - <% if show_closed_reviews %> - <% if plan.progress[:total]==0 %> - - <% else %> - - <% end %> - <% - else - open_reviews_size = plan.open_reviews.size - %> - - - <% end %> - - - <% - end - %> - -
<%= h(plan.name) -%><%= plan.deadline ? plan.deadline.strftime("%d %b %Y") : ' ' -%><%= message('action_plans.no_reviews_linked_to_action_plan') -%> - <%= render :partial => 'action_plans/progress', :locals => {:action_plan => plan} -%> - - <% if open_reviews_size == 0 %> - <%= open_reviews_size -%> - <% else %> - <%= open_reviews_size -%> - <% end %> - -
-
-
-
- -<% end %> - -
- -<% end %> 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 dd4e8477709..5054635cd9a 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 @@ -15,7 +15,7 @@ <% end %> -

<%= message('widget.issues_action_plans.title') -%>

+

<%= message('widget.action_plans.title') -%>

@@ -23,7 +23,7 @@ <% if open_action_plans.size ==0 %> - <%= message('widget.issues_action_plans.no_action_plan') -%> + <%= message('widget.action_plans.no_action_plan') -%> <% else @@ -68,7 +68,7 @@ <% else %> <%= unresolved_issues_size -%> + title="<%= message('widget.action_plans.x_unresolved_issues', :params => unresolved_issues_size.to_s) -%>"><%= unresolved_issues_size -%> <% end %> -- cgit v1.2.3