From: James Moger <james.moger@gitblit.com>
Date: Wed, 31 Jul 2013 19:53:11 +0000 (-0400)
Subject: Manually redirect after branch deletion (issue 282)
X-Git-Tag: v1.3.2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e523d77e5f9d61a7cbf0b2242c8795a22fdf7b45;p=gitblit.git

Manually redirect after branch deletion (issue 282)
---

diff --git a/releases.moxie b/releases.moxie
index 59d5c384..a10aa07e 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,7 +9,9 @@ r19: {
     html: ~
     text: ~
     security: ~
-    fixes: ~
+    fixes:
+    - Fixed Gitblit Authority startup failures when using alternate user services (issue-280)
+    - Manually redirect after branch deletion (issue 282)
     changes: ~
     additions: ~
     dependencyChanges: ~
diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
index 7aa185bd..85d00296 100644
--- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
@@ -15,11 +15,13 @@
  */
 package com.gitblit.wicket.panels;
 
+import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -29,6 +31,9 @@ import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;
 import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.request.target.basic.RedirectRequestTarget;
+import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 
 import com.gitblit.Constants;
@@ -216,6 +221,12 @@ public class BranchesPanel extends BasePanel {
 				else {
 					error(MessageFormat.format("Failed to delete branch \"{0}\"", branch));
 				}
+				
+				// redirect to the owning page
+				PageParameters params = WicketUtils.newRepositoryParameter(repositoryModel.name);
+				String relativeUrl = urlFor(getPage().getClass(), params).toString();
+				String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
+				getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
 			}
 		};