From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/SummaryPage.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index eb6eb07..3cfa152 100644
--- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
@@ -16,12 +16,11 @@
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
@@ -139,7 +138,7 @@
MarkupDocument markupDoc = null;
RevCommit head = JGitUtils.getCommit(r, null);
if (head != null) {
- MarkupProcessor processor = new MarkupProcessor(app().settings());
+ MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());
markupDoc = processor.getReadme(r, repositoryName, getBestCommitId(head));
}
if (markupDoc == null || markupDoc.markup == null) {
@@ -156,21 +155,24 @@
// global, no readme on summary page
add(new Label("readme").setVisible(false));
}
-
- Charts charts = createCharts(metrics);
- add(new HeaderContributor(charts));
-
+
+ if (metrics == null || metrics.isEmpty()) {
+ add(new Label("commitsChart").setVisible(false));
+ } else {
+ Charts charts = createCharts(metrics);
+ add(new HeaderContributor(charts));
+ }
}
@Override
protected String getPageName() {
return getString("gb.summary");
}
-
+
private Charts createCharts(List<Metric> metrics) {
-
+
Charts charts = new Flotr2Charts();
-
+
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String displayFormat = "MMM dd";
if(metrics.size() > 0 && metrics.get(0).name.length() == 7){
@@ -178,11 +180,11 @@
displayFormat = "yyyy MMM";
}
df.setTimeZone(getTimeZone());
-
+
// build google charts
Chart chart = charts.createLineChart("commitsChart", getString("gb.activity"), "day", getString("gb.commits"));
chart.setDateFormat(displayFormat);
-
+
for (Metric metric : metrics) {
Date date;
try {
--
Gitblit v1.9.1