From e523d77e5f9d61a7cbf0b2242c8795a22fdf7b45 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 31 Jul 2013 15:56:10 -0400 Subject: [PATCH] Manually redirect after branch deletion (issue 282) --- src/main/java/com/gitblit/wicket/panels/BranchesPanel.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java index 7aa185b..85d0029 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.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 @@ 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)); } }; -- Gitblit v1.9.1