commit d0e4546f0c8e639db893c979287d32f0a9089e18
author Edwin Kempin <ekempin@google.com> Tue Jul 04 13:31:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 04 13:31:11 2017 +0000
tree b0682e8aef6b5c223aac9538d34d73bb47d235c7
parent 0bfd454d3ee71774fdef577893802395bd3b6a9a
parent 58f6a7e80bea82aa53897cd3498fcdc1633743eb

Merge "AccountDetailInfo: Include flag if account is inactive"

Documentation/rest-api-accounts.txt

diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index f55d04a..dbb044f 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -2128,6 +2128,8 @@
 |`registered_on`     ||
 The link:rest-api.html#timestamp[timestamp] of when the account was
 registered.
+|`inactive`          |not set if `false`|
+Whether the account is inactive.
 |=================================
 
 [[account-external-id-info]]

gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java
index 9eafec0..30eb377 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java
@@ -42,6 +42,7 @@
     Account a = rsrc.getUser().getAccount();
     AccountDetailInfo info = new AccountDetailInfo(a.getId().get());
     info.registeredOn = a.getRegisteredOn();
+    info.inactive = !a.isActive() ? true : null;
     try {
       directory.fillAccountInfo(Collections.singleton(info), EnumSet.allOf(FillOptions.class));
     } catch (DirectoryException e) {
@@ -53,6 +54,7 @@
 
   public static class AccountDetailInfo extends AccountInfo {
     public Timestamp registeredOn;
+    public Boolean inactive;
 
     public AccountDetailInfo(Integer id) {
       super(id);