diff options
| author | James Moger <james.moger@gitblit.com> | 2013-12-10 12:06:19 -0800 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-12-10 12:06:19 -0800 |
| commit | a745a5fbbb9aa2e810264a7cf8cad76138431850 (patch) | |
| tree | 3f6354880c64770c284698ae8c9b40b24018f1f3 /src | |
| parent | 4ce3ff698808bcf0fa6e9820673c366f5504861d (diff) | |
| parent | 06fa257080ab8de7986ad5debbf317eddf5608e7 (diff) | |
| download | gitblit-a745a5fbbb9aa2e810264a7cf8cad76138431850.tar.gz gitblit-a745a5fbbb9aa2e810264a7cf8cad76138431850.zip | |
Merge pull request #128 from alexmob/issue-350
Fix chart failure when an apostrophe is in a user display name (issue-350)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/charting/GooglePieChart.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java index ca894777..44da20ab 100644 --- 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 { 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));
diff --git a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java index 546a2a9b..71191664 100644 --- 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) {
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));
|