From 5386a2be537303e68d27bdaa4d9c62c09493c654 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 Dec 2011 08:18:16 -0500
Subject: [PATCH] Fixed revlog where start of range is the zeroId

---
 src/com/gitblit/wicket/pages/RootPage.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/com/gitblit/wicket/pages/RootPage.java
index 69ac25d..a907c73 100644
--- a/src/com/gitblit/wicket/pages/RootPage.java
+++ b/src/com/gitblit/wicket/pages/RootPage.java
@@ -16,12 +16,14 @@
 package com.gitblit.wicket.pages;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
 
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.StatelessForm;
 import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.protocol.http.WebResponse;
@@ -29,10 +31,14 @@
 import com.gitblit.Constants;
 import com.gitblit.GitBlit;
 import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.PageRegistration;
 import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.panels.NavigationPanel;
 
 /**
  * Root page is a topbar, navigable page like Repositories, Users, or
@@ -77,10 +83,17 @@
 				&& GitBlit.getBoolean(Keys.web.showFederationRegistrations, false);
 
 		// navigation links
-		add(new BookmarkablePageLink<Void>("repositories", RepositoriesPage.class));
-		add(new BookmarkablePageLink<Void>("users", UsersPage.class).setVisible(showAdmin));
-		add(new BookmarkablePageLink<Void>("federation", FederationPage.class).setVisible(showAdmin
-				|| showRegistrations));
+		List<PageRegistration> pages = new ArrayList<PageRegistration>();
+		pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class));
+		pages.add(new PageRegistration("gb.activity", ActivityPage.class));
+		if (showAdmin) {
+			pages.add(new PageRegistration("gb.users", UsersPage.class));
+		}
+		if (showAdmin || showRegistrations) {
+			pages.add(new PageRegistration("gb.federation", FederationPage.class));
+		}
+		NavigationPanel navPanel = new NavigationPanel("navPanel", getClass(), pages);
+		add(navPanel);
 
 		// login form
 		StatelessForm<Void> loginForm = new StatelessForm<Void>("loginForm") {
@@ -153,4 +166,81 @@
 			}
 		}
 	}
+
+	protected List<RepositoryModel> getRepositories(PageParameters params) {
+		final UserModel user = GitBlitWebSession.get().getUser();
+		if (params == null) {
+			return GitBlit.self().getRepositoryModels(user);
+		}
+
+		String repositoryName = WicketUtils.getRepositoryName(params);
+		String set = WicketUtils.getSet(params);
+		String regex = WicketUtils.getRegEx(params);
+		String team = WicketUtils.getTeam(params);
+
+		List<RepositoryModel> models = null;
+
+		if (!StringUtils.isEmpty(repositoryName)) {
+			// try 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);
+		}
+
+		if (!StringUtils.isEmpty(regex)) {
+			// filter the repositories by the regex
+			List<RepositoryModel> accessible = GitBlit.self().getRepositoryModels(user);
+			List<RepositoryModel> matchingModels = new ArrayList<RepositoryModel>();
+			Pattern pattern = Pattern.compile(regex);
+			for (RepositoryModel aModel : accessible) {
+				if (pattern.matcher(aModel.name).find()) {
+					matchingModels.add(aModel);
+				}
+			}
+			models = matchingModels;
+		} else if (!StringUtils.isEmpty(set)) {
+			// filter the repositories by the specified sets
+			List<String> sets = StringUtils.getStringsFromValue(set, ",");
+			List<RepositoryModel> matchingModels = new ArrayList<RepositoryModel>();
+			for (RepositoryModel model : models) {
+				for (String curr : sets) {
+					if (model.federationSets.contains(curr)) {
+						matchingModels.add(model);
+					}
+				}
+			}
+			models = matchingModels;
+		} else if (!StringUtils.isEmpty(team)) {
+			// filter the repositories by the specified teams
+			List<String> teams = StringUtils.getStringsFromValue(team, ",");
+			
+			// need TeamModels first
+			List<TeamModel> teamModels = new ArrayList<TeamModel>();
+			for (String name : teams) {
+				TeamModel model = GitBlit.self().getTeamModel(name);
+				if (model != null) {
+					teamModels.add(model);
+				}
+			}
+			
+			// brute-force our way through finding the matching models
+			List<RepositoryModel> matchingModels = new ArrayList<RepositoryModel>();
+			for (RepositoryModel repositoryModel : models) {
+				for (TeamModel teamModel : teamModels) {
+					if (teamModel.hasRepository(repositoryModel.name)) {
+						matchingModels.add(repositoryModel);
+					}
+				}
+			}
+			models = matchingModels;
+		}
+		return models;
+	}
 }

--
Gitblit v1.9.1