opendev/gerrit
Code Issues Proposed changes

Merge "Fix login redirect for non default (root) context" into stable-2.10

Browse Source
This commit is contained in:
Edwin Kempin
2014-11-05 14:33:20 +00:00
committed by Gerrit Code Review
parent c303a34303 2c846e524f
commit 449eb895c5
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
View File

@@ -337,14 +337,7 @@ public class Gerrit implements EntryPoint {
token = token.substring(1);
}
UrlBuilder builder = new UrlBuilder();
builder.setProtocol(Location.getProtocol());
builder.setHost(Location.getHost());
String port = Location.getPort();
if (port != null && !port.isEmpty()) {
builder.setPort(Integer.parseInt(port));
}
return builder.buildString() + ("/login/" + URL.encodePathSegment("#/" + token));
return selfRedirect("login/") + URL.encodePathSegment("#/" + token);
}
public static String selfRedirect(String suffix) {