Skip to content
Snippets Groups Projects
Commit 0221d97b authored by Timm Fitschen's avatar Timm Fitschen Committed by Henrik tom Wörden
Browse files

F deactivate user

parent 0061d983
Branches
Tags
No related merge requests found
...@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
* Bug: When the user password is updated the user is deactivated.
* Semi-fixed a bug which occurs when retrieving old versions of entities which * Semi-fixed a bug which occurs when retrieving old versions of entities which
reference entities which have been deleted in the mean time. The current fix reference entities which have been deleted in the mean time. The current fix
adds a warning message to the reference property in question and sets the adds a warning message to the reference property in question and sets the
......
...@@ -99,13 +99,11 @@ public class UserResource extends AbstractCaosDBServerResource { ...@@ -99,13 +99,11 @@ public class UserResource extends AbstractCaosDBServerResource {
: UserSources.guessRealm(username)); : UserSources.guessRealm(username));
final String password = form.getFirstValue("password"); final String password = form.getFirstValue("password");
final String email = form.getFirstValue("email"); final String email = form.getFirstValue("email");
final UserStatus status = final UserStatus status =
UserStatus.valueOf( form.getFirstValue("status") != null
form.getFirstValue( ? UserStatus.valueOf(form.getFirstValue("status").toUpperCase())
"status", : null;
CaosDBServer.getServerProperty(
ServerProperties.KEY_NEW_USER_DEFAULT_ACTIVITY))
.toUpperCase());
Integer userEntity = null; Integer userEntity = null;
if (form.getFirst("entity") != null) { if (form.getFirst("entity") != null) {
if (form.getFirstValue("entity").isEmpty()) { if (form.getFirstValue("entity").isEmpty()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment