issue-350: Fixes issue when an apostrophe is present in a User's name

diff --git a/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
index ca89477728bc693cf2e3eba3b917892230db7cf4..44da20ab5a282a8cf8fde8bace1e5d280e5cd475 100644 (file)
--- a/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
@@ -41,7 +41,7 @@ public class GoogleLineChart extends GoogleChart {
 \r
                for (int i = 0; i < values.size(); i++) {\r
                        ChartValue value = values.get(i);\r
-                       line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, ''{2}'');", dName, i,\r
+                       line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, \"{2}\");", dName, i,\r
                                        value.name));\r
                        line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 1, {2,number,0.0});", dName,\r
                                        i, value.value));\r

diff --git a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
index 546a2a9b0f95906d6f66d62a44b5aa07536c7d92..71191664f802093d116ad1c40f7633a2feb459ec 100644 (file)
--- a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
@@ -65,7 +65,7 @@ public class GooglePieChart extends GoogleChart {
                        if (i < values.size() - 1) {\r
                                colors.append(',');\r
                        }\r
-                       line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, ''{2}'');", dName, i,\r
+                       line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, \"{2}\");", dName, i,\r
                                        value.name));\r
                        line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 1, {2,number,0.0});", dName,\r
                                        i, value.value));\r