Fix error on generating activity page when there is no activity

diff --git a/releases.moxie b/releases.moxie
index cf332b06a6bd94b1d234ede69fce14aedc366754..78825fd1ab4c14d7f405ebcc1ad19c1659ee4c68 100644 (file)
--- 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 7e347e18f943f292dd3c0dec4f5c1d4bd941615a..99992eaeeddd27e0c6028ea00ba74bf1c5f96d46 100644 (file)
--- 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\r
                        add(new Label("subheader", MessageFormat.format(headerPattern,\r
                                        daysBack)));\r
+                       add(new Label("chartsPanel").setVisible(false));\r
                        add(new Label("activityPanel"));\r
                } else {\r
                        // calculate total commits and total authors\r