From c7d0e84961d49b0f6e7713b9b1cfc6c707161845 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 1 Feb 2013 07:41:43 +0100 Subject: [PATCH] Avoid reloading the group after successful rename The call to the server is not needed since all information to update the UI is already locally available. Change-Id: I7d59dc601fa3afd6ccc55f1d9d8b0b5b59606354 Signed-off-by: Edwin Kempin --- .../gerrit/client/admin/AccountGroupInfoScreen.java | 8 ++++++-- .../google/gerrit/client/admin/AccountGroupScreen.java | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java index 65c3bbc165..7c53812b61 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java @@ -14,7 +14,6 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.VoidResult; import com.google.gerrit.client.groups.GroupApi; @@ -99,7 +98,12 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { GroupApi.renameGroup(getGroupUUID(), newName, new GerritCallback() { public void onSuccess(final com.google.gerrit.client.VoidResult result) { - Gerrit.display(Dispatcher.toGroup(getGroupUUID(), AccountGroupScreen.INFO)); + saveName.setEnabled(false); + setPageTitle(Util.M.group(newName)); + groupNameTxt.setText(newName); + if (getGroupUUID().equals(getOwnerGroupUUID())) { + ownerTxt.setText(newName); + } } }); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java index 51ca2b7e2c..bf9bd1470f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java @@ -71,6 +71,10 @@ public abstract class AccountGroupScreen extends MenuScreen { groupDetail.ownerGroup.setName(ownerGroup.name()); } + protected AccountGroup.UUID getOwnerGroupUUID() { + return groupDetail.group.getOwnerGroupUUID(); + } + protected void setMembersTabVisible(final boolean visible) { setLinkVisible(membersTabToken, visible); }