summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-10-15 09:43:09 -0400
committerJames Moger <james.moger@gitblit.com>2013-10-15 09:43:09 -0400
commite1908933fa9968b11e9ea03d88730aee3140534b (patch)
treeca609bfb6dc3b94b788922a70701db869b3eddce
parente9dac2e9ead1decb8abb1bf9df3cd638a2f5eb04 (diff)
downloadgitblit-e1908933fa9968b11e9ea03d88730aee3140534b.tar.gz
gitblit-e1908933fa9968b11e9ea03d88730aee3140534b.zip
Fix error on generating activity page when there is no activity
-rw-r--r--releases.moxie1
-rw-r--r--src/main/java/com/gitblit/wicket/pages/ActivityPage.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie
index cf332b06..78825fd1 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -13,6 +13,7 @@ r20: {
- Fixed support for implied SSH urls in web.otherUrls (issue-311)
- Fix potential NPE on removing uncached repository from cache
- Ignore the default contents of .git/description file
+ - Fix error on generating activity page when there is no activity
changes:
- Personal repository prefix (~) is now configurable (issue-265)
- Reversed line links in blob view (issue-309)
diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index 7e347e18..99992eae 100644
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
@@ -96,6 +96,7 @@ public class ActivityPage extends RootPage {
// no activity, skip graphs and activity panel
add(new Label("subheader", MessageFormat.format(headerPattern,
daysBack)));
+ add(new Label("chartsPanel").setVisible(false));
add(new Label("activityPanel"));
} else {
// calculate total commits and total authors