From a047669265c4090d7d0982f5654d4974a58ac12a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 19 Sep 2013 08:36:25 -0400 Subject: [PATCH] Disable *most* activity graphs when web.generateActivityGraph=false --- src/main/java/com/gitblit/wicket/pages/ActivityPage.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java index 413403b..a436813 100644 --- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java @@ -27,6 +27,7 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.behavior.HeaderContributor; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.panel.Fragment; import com.gitblit.GitBlit; import com.gitblit.Keys; @@ -36,8 +37,8 @@ import com.gitblit.utils.ActivityUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.CacheControl; -import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.CacheControl.LastModified; +import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.PageRegistration.DropDownMenuItem; import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration; import com.gitblit.wicket.WicketUtils; @@ -111,8 +112,13 @@ daysBack, totalCommits, totalAuthors))); // create the activity charts - GoogleCharts charts = createCharts(recentActivity); - add(new HeaderContributor(charts)); + if (GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) { + GoogleCharts charts = createCharts(recentActivity); + add(new HeaderContributor(charts)); + add(new Fragment("chartsPanel", "chartsFragment", this)); + } else { + add(new Label("chartsPanel").setVisible(false)); + } // add activity panel add(new ActivityPanel("activityPanel", recentActivity)); -- Gitblit v1.9.1