From 065a49f3a806b91291aa47d6bd7138bc321e863b Mon Sep 17 00:00:00 2001 From: netroms Date: Thu, 3 Oct 2024 15:18:40 +0800 Subject: [PATCH] fix: add back attribute values at /me endpoint Signed-off-by: Morten Svanaes --- .../java/org/hisp/dhis/webapi/controller/user/MeDto.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/MeDto.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/MeDto.java index d379113862e2..9d01b64987c1 100644 --- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/MeDto.java +++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/MeDto.java @@ -36,6 +36,7 @@ import java.util.Set; import lombok.Getter; import lombok.Setter; +import org.hisp.dhis.attribute.AttributeValue; import org.hisp.dhis.fileresource.FileResource; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.security.acl.Access; @@ -99,6 +100,8 @@ public MeDto( this.programs = programs; this.dataSets = dataSets; this.patTokens = patTokens; + + this.attributeValues = user.getAttributeValues(); } @JsonProperty() private String id; @@ -189,7 +192,5 @@ public MeDto( @JsonProperty() private List patTokens; - protected void setUserCredentials(UserCredentialsDto userCredentialsDto) { - this.userCredentials = userCredentialsDto; - } + @JsonProperty() private Set attributeValues; }