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

RED-4497: Do not apply resize for ResizeRedactions with addtoDictionary in mergeredactionlog

Browse Source
This commit is contained in:
deiflaender 2022-07-07 14:34:13 +02:00
parent 333793021a
commit 6ec27db84a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/redaction-service-api-v1/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>redaction-service-api-v1</artifactId> <artifactId>redaction-service-api-v1</artifactId>
<properties> <properties>
<persistence-service.version>1.166.0</persistence-service.version> <persistence-service.version>1.235.0</persistence-service.version>
</properties> </properties>
<dependencies> <dependencies>

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

@ -321,7 +321,7 @@ public class RedactionLogMergeService {
if (mrw.getItem() instanceof ManualResizeRedaction) { if (mrw.getItem() instanceof ManualResizeRedaction) {
var manualResizeRedact = (ManualResizeRedaction) mrw.getItem(); var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
String manualOverrideReason = null; String manualOverrideReason = null;
if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) { if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED) && (manualResizeRedact.getUpdateDictionary() == null || !manualResizeRedact.getUpdateDictionary())) {
redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types)); redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions())); redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
redactionLogEntry.setValue(manualResizeRedact.getValue()); redactionLogEntry.setValue(manualResizeRedact.getValue());