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

ignore hint that is forced should turn to hint

Browse Source
This commit is contained in:
Timo Bejan 2021-12-06 13:55:14 +02:00
parent a53a61cea3
commit 68a9c93d54
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,14 @@ public class RedactionLogMergeService {
var manualForceRedact = (ManualForceRedact) mrw.getItem(); var manualForceRedact = (ManualForceRedact) mrw.getItem();
String manualOverrideReason = null; String manualOverrideReason = null;
if (manualForceRedact.getStatus().equals(Status.APPROVED)) { if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
redactionLogEntry.setRedacted(true);
// Forcing a skipped hint should result in a hint
if (dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId)) {
redactionLogEntry.setHint(true);
} else {
redactionLogEntry.setRedacted(true);
}
redactionLogEntry.setStatus(Status.APPROVED); redactionLogEntry.setStatus(Status.APPROVED);
redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
.isRedacted(), false)); .isRedacted(), false));