From 357109c5a5518db5925f49a6700a87e7ed30ca14 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Dec 2011 16:19:29 -0500
Subject: [PATCH] Unit testing. Documentation.
---
src/com/gitblit/wicket/pages/ActivityPage.java | 67 +++++++++++++--------------------
1 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/com/gitblit/wicket/pages/ActivityPage.java
index 011eef1..ebdfee3 100644
--- a/src/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/com/gitblit/wicket/pages/ActivityPage.java
@@ -17,7 +17,6 @@
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -25,6 +24,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.wicket.Application;
import org.apache.wicket.PageParameters;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.markup.html.basic.Label;
@@ -33,10 +33,9 @@
import com.gitblit.models.Activity;
import com.gitblit.models.Metric;
import com.gitblit.models.RepositoryModel;
-import com.gitblit.models.UserModel;
import com.gitblit.utils.ActivityUtils;
-import com.gitblit.utils.StringUtils;
-import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.PageRegistration;
+import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.charting.GoogleChart;
import com.gitblit.wicket.charting.GoogleCharts;
@@ -54,7 +53,7 @@
public class ActivityPage extends RootPage {
public ActivityPage(PageParameters params) {
- super();
+ super(params);
setupPage("", "");
// parameters
@@ -95,41 +94,12 @@
add(new ActivityPanel("activityPanel", recentActivity));
}
}
-
- private List<RepositoryModel> getRepositories(PageParameters params) {
- final UserModel user = GitBlitWebSession.get().getUser();
- String set = WicketUtils.getSet(params);
- String repositoryName = WicketUtils.getRepositoryName(params);
-
- List<RepositoryModel> models = null;
- if (!StringUtils.isEmpty(repositoryName)) {
- // named repository
- models = new ArrayList<RepositoryModel>();
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
- if (user.canAccessRepository(model)) {
- models.add(model);
- }
- }
-
- // get all user accessible repositories
- if (models == null) {
- models = GitBlit.self().getRepositoryModels(user);
- }
-
- // filter the repositories by the specified set
- if (!StringUtils.isEmpty(set)) {
- List<String> sets = StringUtils.getStringsFromValue(set, ",");
- List<RepositoryModel> setModels = new ArrayList<RepositoryModel>();
- for (RepositoryModel model : models) {
- for (String curr : sets) {
- if (model.federationSets.contains(curr)) {
- setModels.add(model);
- }
- }
- }
- models = setModels;
- }
- return models;
+
+ @Override
+ protected void addDropDownMenus(List<PageRegistration> pages) {
+ DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters", ActivityPage.class);
+ menu.menuItems.addAll(getFilterMenuItems());
+ pages.add(menu);
}
/**
@@ -208,4 +178,21 @@
return charts;
}
+
+ @Override
+ protected void onBeforeRender() {
+ if (GitBlit.isDebugMode()) {
+ // strip Wicket tags in debug mode for jQuery DOM traversal
+ Application.get().getMarkupSettings().setStripWicketTags(true);
+ }
+ super.onBeforeRender();
+ }
+ @Override
+ protected void onAfterRender() {
+ if (GitBlit.isDebugMode()) {
+ // restore Wicket debug tags
+ Application.get().getMarkupSettings().setStripWicketTags(false);
+ }
+ super.onAfterRender();
+ }
}
--
Gitblit v1.9.1