opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Fix token in Group screen

Change-Id: I8640b84eedba093bc8eb13596c70de8b637111ee
This commit is contained in:
David Pursehouse 2017-01-20 16:16:59 +09:00
commit c3ad2f67fa
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

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