Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker compose up
http://localhost:8080/dtm
```

**Note**: Login with demo username "tbrown" and password "password".
**Note**: Login with demo username "jdoe" and password "password".

See: [Docker Compose Strategy](https://gist.github.com/slominskir/a7da801e8259f5974c978f9c3091d52c)

Expand Down
4 changes: 4 additions & 0 deletions container/keycloak/initdb.d/03_customize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,8 @@ create_user
KC_ROLE_NAME=${KC_RESOURCE}-user
assign_role
KC_ROLE_NAME=testlead
assign_role

KC_USERNAME=jdoe
KC_ROLE_NAME=${KC_RESOURCE}-reviewer
assign_role
10 changes: 0 additions & 10 deletions src/main/java/org/jlab/dtm/business/session/EventFacade.java
Original file line number Diff line number Diff line change
Expand Up @@ -229,18 +229,8 @@ public void editEvent(BigInteger eventId, Date timeUp, String title, BigInteger
"An event of type " + event.getEventType().getName() + " is already open");
}

// if(event.getTimeUp() != null) { // The event is being re-opened
// }
validateEventTimeUp(event, new Date());

// Clear reviewed by field of all incidents as not supposed to be able to review incidents in
// an open event
for (Incident incident : event.getIncidentList()) {
if (incident.getReviewedUsername() != null) {
incident.setReviewedUsername(null);
}
}

event.setTimeUp(timeUp);

escalationService.resetEscalation(event);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,6 @@ private void validateAndPopulateIncident(
if (!reviewer) {
throw new UserFriendlyException("You must be a reviewer to set the reviewed by field");
}

if (!incident.getEvent().isClosed()) {
throw new UserFriendlyException(
"You cannot review an incident belonging to an open event (Reviewed By field must be empty)");
} // NOTE: if you re-open an event we clear all reviewed by fields of sibling incidents
// automatically
}

if (incident.getExpertAcknowledged() == null) {
Expand Down
Loading