Merge "Display groupUUID on AccountGroupInfoScreen"

5 files changed, 23 insertions, 0 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
index 6dd1e07f..7d03bbb4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
@@ -114,6 +114,7 @@ public interface GerritCss extends CssResource {
   String gerritTopMenu();
   String gerritBody();
   String groupName();
+  String groupUUIDPanel();
   String header();
   String hyperlink();
   String iconCell();
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 689fdb40..11969f5d 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
@@ -40,6 +40,7 @@ import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.SuggestBox;
 import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwtexpui.clippy.client.CopyableLabel;
 import com.google.gwtexpui.globalkey.client.NpTextArea;
 import com.google.gwtexpui.globalkey.client.NpTextBox;
 import com.google.gwtjsonrpc.client.VoidResult;
@@ -47,6 +48,8 @@ import com.google.gwtjsonrpc.client.VoidResult;
 import java.util.List;
 
 public class AccountGroupInfoScreen extends AccountGroupScreen {
+  private CopyableLabel groupUUIDLabel;
+
   private NpTextBox groupNameTxt;
   private Button saveName;
 
@@ -79,6 +82,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
   @Override
   protected void onInitUI() {
     super.onInitUI();
+    initUUID();
     initName();
     initOwner();
     initDescription();
@@ -99,6 +103,15 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
     emailOnlyAuthors.setEnabled(canModify);
   }
 
+  private void initUUID() {
+    final VerticalPanel groupUUIDPanel = new VerticalPanel();
+    groupUUIDPanel.setStyleName(Gerrit.RESOURCES.css().groupUUIDPanel());
+    groupUUIDPanel.add(new SmallHeading(Util.C.headingGroupUUID()));
+    groupUUIDLabel = new CopyableLabel("");
+    groupUUIDPanel.add(groupUUIDLabel);
+    add(groupUUIDPanel);
+  }
+
   private void initName() {
     final VerticalPanel groupNamePanel = new VerticalPanel();
     groupNameTxt = new NpTextBox();
@@ -424,6 +437,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
   @Override
   protected void display(final GroupDetail groupDetail) {
     final AccountGroup group = groupDetail.group;
+    groupUUIDLabel.setText(group.getGroupUUID().get());
     groupNameTxt.setText(group.getName());
     if (groupDetail.ownerGroup != null) {
       ownerTxt.setText(groupDetail.ownerGroup.getName());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
index e9d5c9a2..d886e5a9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
@@ -46,6 +46,7 @@ public interface AdminConstants extends Constants {
   String buttonSaveGroupOptions();
   String suggestedGroupLabel();
 
+  String headingGroupUUID();
   String headingOwner();
   String headingDescription();
   String headingProjectOptions();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
index 498c500b..d099f160 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
@@ -26,6 +26,7 @@ suggestedGroupLabel = group
 emailOnlyAuthors = Authors
 descriptionNotifications = Send email notifications about comments and actions by users in this group only to:
 
+headingGroupUUID = Group UUID
 headingOwner = Owners
 headingDescription = Description
 headingProjectOptions = Project Options
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
index e0029197..a9c27e06 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -1309,3 +1309,9 @@ a:hover.downloadLink {
   margin: 4px;
   opacity: 0.90;
 }
+
+
+/** AccountGroupInfoScreen **/
+.groupUUIDPanel {
+  margin-bottom: 10px;
+}