diff options
author | Paladox none <thomasmulhall410@yahoo.com> | 2017-04-03 13:55:06 +0000 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2017-04-05 07:43:21 +0000 |
commit | 91d23a44bc8d01e3651f6aa0d4dfca9d463554ec (patch) | |
tree | 45547e2e0a11ed42c2f43972ca89066b8125d2e9 | |
parent | e248839c4143523b0138a7d6fb6c129490813cb1 (diff) |
Include current path in "New UI" link
Bug: Issue 5912
Change-Id: Iad3d650bd0166dc2267752baf689027c419b4d30
(cherry picked from commit 7ed9690a917b0feb43d1257eac648526ed61874a)
-rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java index 410ba3e85e..17ad4f6c05 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java @@ -558,7 +558,10 @@ public class Gerrit implements EntryPoint { builder.setPort(Integer.parseInt(port)); } String[] tokens = token.split("@", 2); - builder.setPath(tokens[0]); + if (Location.getPath().endsWith("/") && tokens[0].startsWith("/")) { + tokens[0] = tokens[0].substring(1); + } + builder.setPath(Location.getPath() + tokens[0]); if (tokens.length == 2) { builder.setHash(tokens[1]); } |