From 166cc8759a3900a1ccdad52b8b1f62f4f721c1a0 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 28 Aug 2015 11:03:57 +0200 Subject: [PATCH] fix SONAR-6290 --- .../dashboard/widget/measure_filter_bubble_chart.html.erb | 4 ++-- .../server/dashboard/widget/measure_filter_cloud.html.erb | 4 ++-- .../dashboard/widget/measure_filter_pie_chart.html.erb | 4 ++-- .../server/dashboard/widget/measure_filter_treemap.html.erb | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb index c5a23025495..4c69820bf3f 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb +++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_bubble_chart.html.erb @@ -52,8 +52,8 @@ baseUrl: baseUrl + '/dashboard/index', xLog: <%= xLog -%>, yLog: <%= yLog -%>, - noData: '<%= message('no_data') -%>', - noMainMetric: '<%= message('widget.measure_filter.no_main_metric') -%>' + noData: '<%= escape_javascript message('no_data') -%>', + noMainMetric: '<%= escape_javascript message('widget.measure_filter.no_main_metric') -%>' }) .render('#<%= containerId -%>'); diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb index c45bb01cfcc..83e4f0a996f 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb +++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_cloud.html.erb @@ -42,9 +42,9 @@ .source(baseUrl + '/measures/search_filter?' + query) .metricsPriority(metrics) .options({ - maxItemsReachedMessage: '<%= message("widget.measure_filter_histogram.max_items_reached", :params => [maxItems]) -%>', + maxItemsReachedMessage: '<%= escape_javascript message("widget.measure_filter_histogram.max_items_reached", :params => [maxItems]) -%>', baseUrl: baseUrl + '/dashboard/index', - noData: '<%= message('no_data') -%>' + noData: '<%= escape_javascript message('no_data') -%>' }) .render('#<%= containerId -%>'); diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb index c011ede3f1d..84b1c458049 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb +++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_pie_chart.html.erb @@ -48,8 +48,8 @@ .height(<%= chartHeight %>) .options({ baseUrl: baseUrl + '/dashboard/index', - noData: '<%= message('no_data') -%>', - noMainMetric: '<%= message('widget.measure_filter.no_main_metric') -%>' + noData: '<%= escape_javascript message('no_data') -%>', + noMainMetric: '<%= escape_javascript message('widget.measure_filter.no_main_metric') -%>' }) .render('#<%= containerId -%>'); diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb index 48c08f864f2..0fcdfa14370 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb +++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/measure_filter_treemap.html.erb @@ -49,10 +49,10 @@ .options({ heightInPercents: '<%= widget_properties['heightInPercents'] -%>', maxItems: <%= maxItems -%>, - maxItemsReachedMessage: '<%= message("widget.measure_filter_histogram.max_items_reached", :params => [maxItems]) -%>', + maxItemsReachedMessage: '<%= escape_javascript message("widget.measure_filter_histogram.max_items_reached", :params => [maxItems]) -%>', baseUrl: baseUrl + '/dashboard/index', - noData: '<%= message('no_data') -%>', - resource: '<%= filter.name -%>' + noData: '<%= escape_javascript message('no_data') -%>', + resource: '<%= escape_javascript filter.name -%>' }) .render('#<%= containerId -%>'); -- 2.39.5