From b932aab97767f8bec43908497646054c81bf9c86 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 23 Sep 2013 09:52:48 -0400 Subject: [PATCH] Fix commit log css for branch graphs --- src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java index d951da3..0768b2a 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java @@ -43,11 +43,14 @@ import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.CacheControl; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.CacheControl.LastModified; import com.gitblit.wicket.panels.FilterableProjectList; import com.gitblit.wicket.panels.FilterableRepositoryList; +@CacheControl(LastModified.ACTIVITY) public class MyDashboardPage extends DashboardPage { public MyDashboardPage() { @@ -93,9 +96,13 @@ // parameters int daysBack = params == null ? 0 : WicketUtils.getDaysBack(params); + int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30); if (daysBack < 1) { daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7); } + if (maxDaysBack > 0 && daysBack > maxDaysBack) { + daysBack = maxDaysBack; + } Calendar c = Calendar.getInstance(); c.add(Calendar.DATE, -1*daysBack); Date minimumDate = c.getTime(); -- Gitblit v1.9.1