MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' into languages-fixes

This commit is contained in:
CITE\spapacharalampous 2024-09-10 17:48:01 +03:00
parent d139b905d9 76a7b9572d
commit 17afe9e1ce
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/core/src/main/java/org/opencdmp/errorcode/ErrorThesaurusProperties.java
View File

@ -538,4 +538,10 @@ public class ErrorThesaurusProperties {
public void setMissingGlobalRole(ErrorDescription missingGlobalRole) {
this.missingGlobalRole = missingGlobalRole;
}
private ErrorDescription userProfileInactive;
public ErrorDescription getUserProfileInactive() { return userProfileInactive; }
public void setUserProfileInactive(ErrorDescription userProfileInactive) {this.userProfileInactive = userProfileInactive; }
}

4
backend/core/src/main/java/org/opencdmp/service/user/UserServiceImpl.java
View File

@ -351,9 +351,9 @@ public class UserServiceImpl implements UserService {
List<UserCredentialEntity> userCredentials = this.queryFactory.query(UserCredentialQuery.class).disableTracking().userIds(data.getId()).collect();
if (userCredentials.isEmpty())
throw new MyApplicationException("Currently cannot update roles for this user");
throw new MyApplicationException(this.errors.getUserProfileInactive().getCode(), this.errors.getUserProfileInactive().getMessage());
if (userCredentials.getFirst().getExternalId() == null)
throw new MyApplicationException("Currently cannot update roles for this user");
throw new MyApplicationException(this.errors.getUserProfileInactive().getCode(), this.errors.getUserProfileInactive().getMessage());
if (!model.getHasTenantAdminMode()) this.applyGlobalRoles(data.getId(), model);

1
frontend/src/app/core/common/enum/respone-error-code.ts
View File

@ -55,6 +55,7 @@ export enum ResponseErrorCode {
planBlueprintImportDraft = 157,
missingTenantRole = 158,
missingGlobalRole = 159,
userProfileInactive = 160,
// Notification & Annotation Errors
InvalidApiKey = 200,