From 1e5905b8da9b76356c99a3d94b2ca9068ffe1c93 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 08:08:58 -0400
Subject: [PATCH] Merge branch 'ticket/136' into develop
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index b454b7a..03d1918 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -45,6 +45,7 @@
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.target.basic.RedirectRequestTarget;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
@@ -110,6 +111,15 @@
String relativeUrl = urlFor(clazz, params).toString();
String canonicalUrl = RequestUtils.toAbsolutePath(relativeUrl);
return canonicalUrl;
+ }
+
+ protected void manualRedirect(Class<? extends BasePage> pageClass) {
+ redirect(pageClass, null);
+ }
+
+ protected void redirect(Class<? extends BasePage> pageClass, PageParameters parameters) {
+ String absoluteUrl = getCanonicalUrl(pageClass, parameters);
+ getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
}
protected String getLanguageCode() {
@@ -495,4 +505,5 @@
}
return sb.toString();
}
+
}
--
Gitblit v1.9.1