Browse Source

Manually redirect after branch deletion (issue 282)

tags/v1.3.2
James Moger 10 years ago
parent
commit
e523d77e5f
2 changed files with 14 additions and 1 deletions
  1. 3
    1
      releases.moxie
  2. 11
    0
      src/main/java/com/gitblit/wicket/panels/BranchesPanel.java

+ 3
- 1
releases.moxie View File

html: ~ html: ~
text: ~ text: ~
security: ~ security: ~
fixes: ~
fixes:
- Fixed Gitblit Authority startup failures when using alternate user services (issue-280)
- Manually redirect after branch deletion (issue 282)
changes: ~ changes: ~
additions: ~ additions: ~
dependencyChanges: ~ dependencyChanges: ~

+ 11
- 0
src/main/java/com/gitblit/wicket/panels/BranchesPanel.java View File

*/ */
package com.gitblit.wicket.panels; package com.gitblit.wicket.panels;
import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.StringResourceModel; 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 org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants; import com.gitblit.Constants;
else { else {
error(MessageFormat.format("Failed to delete branch \"{0}\"", branch)); 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));
} }
}; };

Loading…
Cancel
Save