opendev/gerrit
Code Issues Proposed changes

Merge "AccountDetailInfo: Include flag if account is inactive"

Browse Source
This commit is contained in:
Edwin Kempin
2017-07-04 13:31:11 +00:00
committed by Gerrit Code Review
parent 0bfd454d3e 58f6a7e80b
commit d0e4546f0c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/rest-api-accounts.txt
View File

@@ -2128,6 +2128,8 @@ AccountInfo]. In addition `AccountDetailInfo` has the following fields:
|`registered_on` || |`registered_on` ||
The link:rest-api.html#timestamp[timestamp] of when the account was The link:rest-api.html#timestamp[timestamp] of when the account was
registered. registered.
|`inactive` |not set if `false`|
Whether the account is inactive.
|================================= |=================================
[[account-external-id-info]] [[account-external-id-info]]

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

@@ -42,6 +42,7 @@ public class GetDetail implements RestReadView<AccountResource> {
Account a = rsrc.getUser().getAccount(); Account a = rsrc.getUser().getAccount();
AccountDetailInfo info = new AccountDetailInfo(a.getId().get()); AccountDetailInfo info = new AccountDetailInfo(a.getId().get());
info.registeredOn = a.getRegisteredOn(); info.registeredOn = a.getRegisteredOn();
info.inactive = !a.isActive() ? true : null;
try { try {
directory.fillAccountInfo(Collections.singleton(info), EnumSet.allOf(FillOptions.class)); directory.fillAccountInfo(Collections.singleton(info), EnumSet.allOf(FillOptions.class));
} catch (DirectoryException e) { } catch (DirectoryException e) {
@@ -53,6 +54,7 @@ public class GetDetail implements RestReadView<AccountResource> {
public static class AccountDetailInfo extends AccountInfo { public static class AccountDetailInfo extends AccountInfo {
public Timestamp registeredOn; public Timestamp registeredOn;
public Boolean inactive;
public AccountDetailInfo(Integer id) { public AccountDetailInfo(Integer id) {
super(id); super(id);