From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
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