diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-10-09 15:05:37 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-10-09 15:05:37 +0200 |
| commit | 393f9888e69e209b2755aebaed3709a167399b29 (patch) | |
| tree | a92d790a9cc7ad42691250de7a4fe4c52346f75b /plugins/sonar-core-plugin | |
| parent | 03970eafff028da26540ef814619a02168a57618 (diff) | |
| parent | b0903c3790a72643840e147501a739604e3083de (diff) | |
| download | sonarqube-393f9888e69e209b2755aebaed3709a167399b29.tar.gz sonarqube-393f9888e69e209b2755aebaed3709a167399b29.zip | |
Fix merge with 4.5
Diffstat (limited to 'plugins/sonar-core-plugin')
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java index 96799dfec2c..b7deddf94a0 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java @@ -57,7 +57,6 @@ public final class ProjectDefaultDashboard extends DashboardTemplate { dashboard.addWidget("rules", 2); dashboard.addWidget("alerts", 2); dashboard.addWidget("file_design", 2); - dashboard.addWidget("package_design", 2); dashboard.addWidget("code_coverage", 2); } diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb index 5cc449a0fe8..6e5c662f104 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb @@ -167,7 +167,7 @@ <% else %> <% timeline = 'timeline' + widget.id.to_s %> - <div id="timeline-chart-<%= widget.id -%>" style="height: <%= chartHeight -%>px;"></div> + <div id="timeline-chart-<%= widget.id -%>"></div> <script> function d(y, m, d, h, min, s) { return new Date(y, m, d, h, min, s); @@ -182,6 +182,7 @@ .snapshots(snapshots) .metrics(metrics) .events(events); + <%= timeline -%>.limitedHistoricalData = '<%= message('widget.timeline.limited_histortical_data') -%>'; <%= timeline -%>.render(); autoResize(200, function() { diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java index 9da3ea6f7fe..ad3afee325c 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java @@ -44,6 +44,6 @@ public class ProjectDefaultDashboardTest { Dashboard dashboard = template.createDashboard(); assertThat(dashboard.getLayout()).isEqualTo(DashboardLayout.TWO_COLUMNS); - assertThat(dashboard.getWidgets()).hasSize(11); + assertThat(dashboard.getWidgets()).hasSize(10); } } |