Skip to content

The Unified and Autonomous Development Platform

Fix the issue that url "/<account>/<depot>" is redirected to "/<account>/<depot>/blob"

robin shen03dcb6d23b6b
diff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
index 1c7bd0d55c..8ce4c019f0 100644
--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
@@ -1,8 +1,10 @@
package com.gitplex.server.web;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.CompoundRequestMapper;
import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;
@@ -165,7 +167,25 @@ public class UrlMapper extends CompoundRequestMapper {
});
- add(new DepotMapper("${account}/${depot}/blob/#{revision}/#{path}", DepotBlobPage.class));
+ add(new DepotMapper("${account}/${depot}/blob/#{revision}/#{path}", DepotBlobPage.class) {
+
+ /*
+ * This logic is added to prevent url "/<account>/<depot>" from being redirected to
+ * "/<account>/<depot>/blob"
+ */
+ @Override
+ public Url mapHandler(IRequestHandler requestHandler) {
+ if (requestHandler instanceof IPageClassRequestHandler) {
+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
+ if (pageClassRequestHandler.getPageClass() == DepotBlobPage.class
+ && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {
+ return null;
+ }
+ }
+ return super.mapHandler(requestHandler);
+ }
+
+ });
add(new DepotMapper("${account}/${depot}/commit/${revision}", CommitDetailPage.class));
add(new DepotMapper("${account}/${depot}/commits", DepotCommitsPage.class));
add(new DepotMapper("${account}/${depot}/compare", RevisionComparePage.class));