From 6bd25df6bd0dfbc2e516ba5d392e7ba580b6eea9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 03 Jul 2014 16:16:54 -0400 Subject: [PATCH] Switch apt folder from 'dagger' to 'gen' --- src/main/java/com/gitblit/wicket/pages/ForksPage.java | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ForksPage.java b/src/main/java/com/gitblit/wicket/pages/ForksPage.java index cc48387..9fd7f4d 100644 --- a/src/main/java/com/gitblit/wicket/pages/ForksPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ForksPage.java @@ -27,7 +27,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.eclipse.jgit.lib.PersonIdent; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.ForkModel; import com.gitblit.models.RepositoryModel; @@ -42,22 +41,27 @@ public ForksPage(PageParameters params) { super(params); - + final RepositoryModel pageRepository = getRepositoryModel(); - - ForkModel root = GitBlit.self().getForkNetwork(pageRepository.name); + + ForkModel root = app().repositories().getForkNetwork(pageRepository.name); List<FlatFork> network = flatten(root); - + ListDataProvider<FlatFork> forksDp = new ListDataProvider<FlatFork>(network); DataView<FlatFork> forksList = new DataView<FlatFork>("fork", forksDp) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<FlatFork> item) { FlatFork fork = item.getModelObject(); RepositoryModel repository = fork.repository; - + if (repository.isPersonalRepository()) { - UserModel user = GitBlit.self().getUserModel(repository.projectPath.substring(1)); + UserModel user = app().users().getUserModel(repository.projectPath.substring(1)); + if (user == null) { + // user account no longer exists + user = new UserModel(repository.projectPath.substring(1)); + } PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress); item.add(new GravatarImage("anAvatar", ident, 20)); if (pageRepository.equals(repository)) { @@ -79,7 +83,7 @@ item.add(swatch); String projectName = repository.projectPath; if (StringUtils.isEmpty(projectName)) { - projectName = GitBlit.getString(Keys.web.repositoryRootGroupName, "main"); + projectName = app().settings().getString(Keys.web.repositoryRootGroupName, "main"); } if (pageRepository.equals(repository)) { // do not link to self @@ -88,7 +92,7 @@ item.add(new LinkPanel("aProject", null, projectName, ProjectPage.class, WicketUtils.newProjectParameter(projectName))); } } - + String repo = StringUtils.getLastPathElement(repository.name); UserModel user = GitBlitWebSession.get().getUser(); if (user == null) { @@ -106,7 +110,7 @@ item.add(new Label("aFork", repo)); item.add(new Label("lastChange").setVisible(false)); } - + WicketUtils.setCssStyle(item, "margin-left:" + (32*fork.level) + "px;"); if (fork.level == 0) { WicketUtils.setCssClass(item, "forkSource"); @@ -115,7 +119,7 @@ } } }; - + add(forksList); } @@ -123,13 +127,13 @@ protected String getPageName() { return getString("gb.forks"); } - + protected List<FlatFork> flatten(ForkModel root) { List<FlatFork> list = new ArrayList<FlatFork>(); list.addAll(flatten(root, 0)); return list; } - + protected List<FlatFork> flatten(ForkModel node, int level) { List<FlatFork> list = new ArrayList<FlatFork>(); list.add(new FlatFork(node.repository, level)); @@ -140,14 +144,14 @@ } return list; } - + private class FlatFork implements Serializable { - + private static final long serialVersionUID = 1L; public final RepositoryModel repository; public final int level; - + public FlatFork(RepositoryModel repository, int level) { this.repository = repository; this.level = level; -- Gitblit v1.9.1