opendev/gerrit
Code Issues Proposed changes

Fix token in Group screen

Browse Source 
The wrong token leads to a wrong browser history. E.g., pressing
"back-history" button on browser will loop on the group page after
navigating to group page and clicking "General" and "Members" tabs.

Bug: Issue 5298
Change-Id: I3c2f59e5ee35e343563a5174fa0d5456e33bdb88
This commit is contained in:
Hongkai Liu 2017-01-19 11:10:51 -05:00
parent 2897e9d2e3
commit 25d59ce754
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@ -717,11 +717,15 @@ public class Dispatcher {
// shown in the web UI).
//
if (AccountGroup.isInternalGroup(group.getGroupUUID())) {
Gerrit.display(toGroup(group.getGroupId(), AccountGroupScreen.MEMBERS),
new AccountGroupMembersScreen(group, token));
String newToken =
toGroup(group.getGroupId(), AccountGroupScreen.MEMBERS);
Gerrit.display(newToken,
new AccountGroupMembersScreen(group, newToken));
} else {
Gerrit.display(toGroup(group.getGroupId(), AccountGroupScreen.INFO),
new AccountGroupInfoScreen(group, token));
String newToken =
toGroup(group.getGroupId(), AccountGroupScreen.INFO);
Gerrit.display(newToken,
new AccountGroupInfoScreen(group, newToken));
}
} else if (AccountGroupScreen.INFO.equals(panel)) {
Gerrit.display(token, new AccountGroupInfoScreen(group, token));