Manually redirect after branch deletion (issue 282)

diff --git a/releases.moxie b/releases.moxie
index 59d5c38425e99b573edf1bb008b94c37955bc353..a10aa07ea476cfe3da0cf75a38612dccae9993dd 100644 (file)
--- 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 7aa185bdc38eb6eaf71f909a7a6997f7ad565d72..85d00296c3ce485d1fbf6efce2714639d30fe07c 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
@@ -15,11 +15,13 @@
  */\r
 package com.gitblit.wicket.panels;\r
 \r
+import java.io.IOException;\r
 import java.text.MessageFormat;\r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
 import java.util.List;\r
 \r
+import org.apache.wicket.PageParameters;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;\r
 import org.apache.wicket.markup.html.link.ExternalLink;\r
@@ -29,6 +31,9 @@ import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;\r
 import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
 import org.apache.wicket.model.StringResourceModel;\r
+import org.apache.wicket.protocol.http.RequestUtils;\r
+import org.apache.wicket.request.target.basic.RedirectRequestTarget;\r
+import org.eclipse.jgit.lib.Ref;\r
 import org.eclipse.jgit.lib.Repository;\r
 \r
 import com.gitblit.Constants;\r
@@ -216,6 +221,12 @@ public class BranchesPanel extends BasePanel {
                                else {\r
                                        error(MessageFormat.format("Failed to delete branch \"{0}\"", branch));\r
                                }\r
+                               \r
+                               // redirect to the owning page\r
+                               PageParameters params = WicketUtils.newRepositoryParameter(repositoryModel.name);\r
+                               String relativeUrl = urlFor(getPage().getClass(), params).toString();\r
+                               String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);\r
+                               getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));\r
                        }\r
                };\r
                \r