From a48c33a76f3497d33e0c3d0d3cf1a59aef23679f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 11 Jan 2012 16:35:11 -0500 Subject: [PATCH] Fixed missing gbapi ant tag dependency in build process --- src/com/gitblit/wicket/pages/ActivityPage.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/com/gitblit/wicket/pages/ActivityPage.java index 9b258a7..aa2f266 100644 --- a/src/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/com/gitblit/wicket/pages/ActivityPage.java @@ -35,6 +35,7 @@ import com.gitblit.models.Metric; import com.gitblit.models.RepositoryModel; import com.gitblit.utils.ActivityUtils; +import com.gitblit.utils.StringUtils; import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.PageRegistration.DropDownMenuItem; import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration; @@ -109,16 +110,13 @@ PageParameters currentParameters = getPageParameters(); int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14); - if (currentParameters.containsKey("db")) { - daysBack = currentParameters.getInt("db"); - } - if (daysBack < 1) { - daysBack = 14; + if (currentParameters != null && !currentParameters.containsKey("db")) { + currentParameters.put("db", daysBack); } // preserve time filter options on repository choices - filters.menuItems.addAll(getRepositoryFilterItems(new PageParameters("db=" + daysBack))); - + filters.menuItems.addAll(getRepositoryFilterItems(currentParameters)); + // preserve repository filter options on time choices filters.menuItems.addAll(getTimeFilterItems(currentParameters)); @@ -155,7 +153,7 @@ // aggregate repository metrics for (Map.Entry<String, Metric> entry : activity.getRepositoryMetrics().entrySet()) { - String repository = entry.getKey(); + String repository = StringUtils.stripDotGit(entry.getKey()); if (!repositoryMetrics.containsKey(repository)) { repositoryMetrics.put(repository, new Metric(repository)); } -- Gitblit v1.9.1