James Moger
2013-07-31 e523d77e5f9d61a7cbf0b2242c8795a22fdf7b45
Manually redirect after branch deletion (issue-282)
2 files modified
15 ■■■■■ changed files
releases.moxie 4 ●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/panels/BranchesPanel.java 11 ●●●●● patch | view | raw | blame | history
releases.moxie
@@ -9,7 +9,9 @@
    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: ~
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));
            }
        };