From 9bdf88df00e9abf99442e14a33ed6215b32026b6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Oct 2012 17:22:35 -0400
Subject: [PATCH] Use a custom redirect mechanism to workaround servlet container interference

---
 src/com/gitblit/wicket/pages/ForksPage.java |   64 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/ForksPage.java b/src/com/gitblit/wicket/pages/ForksPage.java
index 7b8235b..44f0ed1 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.java
+++ b/src/com/gitblit/wicket/pages/ForksPage.java
@@ -15,12 +15,14 @@
  */
 package com.gitblit.wicket.pages;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -42,26 +44,32 @@
 	public ForksPage(PageParameters params) {
 		super(params);
 		
+		UserModel user = GitBlitWebSession.get().getUser();
 		RepositoryModel model = getRepositoryModel();
-		RepositoryModel origin;
+		RepositoryModel origin = model;
 		List<String> list;
 		if (ArrayUtils.isEmpty(model.forks)) {
-			// origin repository has forks
-			origin = GitBlit.self().getRepositoryModel(model.originRepository);
-			list = new ArrayList<String>(origin.forks);
+			if (!StringUtils.isEmpty(model.originRepository)) {
+				// try origin repository
+				origin = GitBlit.self().getRepositoryModel(model.originRepository);
+			}
+			if (origin == null || origin.forks == null) {
+				list = new ArrayList<String>();
+			} else {
+				list = new ArrayList<String>(origin.forks);
+			}
 		} else {
 			// this repository has forks
-			origin = model;
 			list = new ArrayList<String>(model.forks);
 		}
 		
 		if (origin.isPersonalRepository()) {
 			// personal repository
-			UserModel user = GitBlit.self().getUserModel(origin.projectPath.substring(1));
-			PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
+			UserModel originUser = GitBlit.self().getUserModel(origin.projectPath.substring(1));
+			PersonIdent ident = new PersonIdent(originUser.getDisplayName(), originUser.emailAddress);
 			add(new GravatarImage("forkSourceAvatar", ident, 20));
 			add(new Label("forkSourceSwatch").setVisible(false));
-			add(new LinkPanel("forkSourceProject", null, user.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(user.username)));
+			add(new LinkPanel("forkSourceProject", null, originUser.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(originUser.username)));
 		} else {
 			// standard repository
 			add(new GravatarImage("forkSourceAvatar", new PersonIdent("", ""), 20).setVisible(false));
@@ -85,10 +93,36 @@
 		}
 		
 		String source = StringUtils.getLastPathElement(origin.name);
-		add(new LinkPanel("forkSource", null, StringUtils.stripDotGit(source), SummaryPage.class, WicketUtils.newRepositoryParameter(origin.name)));
+		if (user != null && user.canViewRepository(origin)) {
+			// user can view the origin
+			add(new LinkPanel("forkSource", null, StringUtils.stripDotGit(source), SummaryPage.class, WicketUtils.newRepositoryParameter(origin.name)));
+		} else {
+			// user can not view the origin
+			add(new Label("forkSource", StringUtils.stripDotGit(source)));
+		}
+		
+		// superOrigin?
+		if (StringUtils.isEmpty(origin.originRepository)) {
+			// origin is root
+			add(new Label("forkSourceOrigin").setVisible(false));
+		} else {
+			// origin has an origin
+			RepositoryModel superOrigin = GitBlit.self().getRepositoryModel(origin.originRepository);
+			if (!user.canViewRepository(superOrigin)) {
+				// show superOrigin repository without link
+				Fragment forkFrag = new Fragment("forkSourceOrigin", "originFragment", this);
+				forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(superOrigin.name)));
+				add(forkFrag);
+			} else {
+				// link to superOrigin repository
+				Fragment forkFrag = new Fragment("forkSourceOrigin", "originFragment", this);
+				forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(superOrigin.name), 
+					SummaryPage.class, WicketUtils.newRepositoryParameter(superOrigin.name)));
+				add(forkFrag);
+			}
+		}
 
 		// only display user-accessible forks
-		UserModel user = GitBlitWebSession.get().getUser();
 		List<RepositoryModel> forks = new ArrayList<RepositoryModel>();
 		for (String aFork : list) {
 			RepositoryModel fork = GitBlit.self().getRepositoryModel(user, aFork);
@@ -118,7 +152,15 @@
 				String repo = StringUtils.getLastPathElement(fork.name);
 				item.add(new LinkPanel("aFork", null, StringUtils.stripDotGit(repo), SummaryPage.class, WicketUtils.newRepositoryParameter(fork.name)));
 				
-				WicketUtils.setCssStyle(item, "margin-left:25px;");
+				if (ArrayUtils.isEmpty(fork.forks)) {
+					// repository is a leaf
+					Component icon = new Label("anIcon", "<i class=\"icon-leaf\" ></i>").setEscapeModelStrings(false);
+					WicketUtils.setHtmlTooltip(icon, MessageFormat.format(getString("gb.noForks"), fork.name));
+					item.add(icon);
+				} else {
+					// show forks link
+					item.add(new LinkPanel("anIcon", null, "(" + getString("gb.forks") + ")", ForksPage.class, WicketUtils.newRepositoryParameter(fork.name)));
+				}
 			}
 		};
 		

--
Gitblit v1.9.1