fix SONAR-6290

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 c5a2302549521d3ab65fb85ba865b6e7bf4bf694..4c69820bf3f8dd8de5771bb30a850b67bbdabde8 100644 (file)
--- 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 c45bb01cfcc0bc13f2232eec6c51ddc1726a99ec..83e4f0a996f1da405cb44a916158bc7ec16d3331 100644 (file)
--- 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 c011ede3f1dbfaa6c3f894374a9131b2215fcf71..84b1c458049df4e6e5d438aaa8db93830d3529b8 100644 (file)
--- 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 48c08f864f2fff2acb127dd387bc4596d3425205..0fcdfa14370f84dbf02945bcc40131bc4b819e83 100644 (file)
--- 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 -%>');