Merge pull request #128 from alexmob/issue-350

James Moger

2013-12-10 a745a5fbbb9aa2e810264a7cf8cad76138431850

Merge pull request #128 from alexmob/issue-350

Fix chart failure when an apostrophe is in a user display name (issue-350)

 src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java

@@ -41,7 +41,7 @@


        for (int i = 0; i < values.size(); i++) {

            ChartValue value = values.get(i);

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, ''{2}'');", dName, i,

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, \"{2}\");", dName, i,

                    value.name));

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 1, {2,number,0.0});", dName,

                    i, value.value));


 src/main/java/com/gitblit/wicket/charting/GooglePieChart.java

@@ -65,7 +65,7 @@
            if (i < values.size() - 1) {

                colors.append(',');

            }

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, ''{2}'');", dName, i,

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, \"{2}\");", dName, i,

                    value.name));

            line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 1, {2,number,0.0});", dName,

                    i, value.value));