From 40538c57dd574d831d044cda50a8999941dc0a24 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 25 Feb 2012 08:18:22 -0500 Subject: [PATCH] Use proper timezone to generate all metrics --- src/com/gitblit/wicket/pages/ActivityPage.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/com/gitblit/wicket/pages/ActivityPage.java index e59e68e..bceac8f 100644 --- a/src/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/com/gitblit/wicket/pages/ActivityPage.java @@ -67,7 +67,8 @@ // determine repositories to view and retrieve the activity List<RepositoryModel> models = getRepositories(params); - List<Activity> recentActivity = ActivityUtils.getRecentActivity(models, daysBack, objectId); + List<Activity> recentActivity = ActivityUtils.getRecentActivity(models, + daysBack, objectId, getTimeZone()); if (recentActivity.size() == 0) { // no activity, skip graphs and activity panel @@ -173,6 +174,7 @@ GoogleChart chart = new GoogleLineChart("chartDaily", getString("gb.dailyActivity"), "day", getString("gb.commits")); SimpleDateFormat df = new SimpleDateFormat("MMM dd"); + df.setTimeZone(getTimeZone()); for (Activity metric : recentActivity) { chart.addValue(df.format(metric.startDate), metric.getCommitCount()); } -- Gitblit v1.9.1