Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Pull request #257: RED-2482: Always redact manual justification changes

Browse Source 
Merge in RED/redaction-service from RED-2482 to release/2.52.x

* commit '90456602b0facabb99804d81f748bd0f13bbb0fa':
  RED-2482: Always redact manual justification changes
This commit is contained in:
Kresnadi Budisantoso 2021-10-28 13:38:15 +02:00 committed by Dominique Eiflaender
commit 46e7c83153
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
View File

@ -190,6 +190,7 @@ public class RedactionLogMergeService {
String manualOverrideReason = null;
if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
redactionLogEntry.setStatus(Status.APPROVED);
redactionLogEntry.setRedacted(true);
manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
} else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {