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

Pull request #10: RED-824: Do not add recommendations to redaction log

Browse Source 
Merge in RED/redaction-report-service from RED-824 to master

* commit 'd831f57f86d2f8791f095bdaf9bfd34b569c1a8b':
  RED-824: Do not add recommendations to redaction log
This commit is contained in:
Dominique Eiflaender 2020-12-08 10:58:20 +01:00
commit 11efe35be9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>redaction-service-api-v1</artifactId>
<version>1.4.7</version>
<version>1.5.4</version>
</dependency>
<dependency>
<!-- This dependency contains annotations that are used in specifying REST endpoints. -->

4
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
View File

@ -72,6 +72,10 @@ public class ReportGenerationService {
if (entry.isRedacted()) {
if(entry.isRecommendation()){
return;
}
if (entry.isManual() && entry.getManualRedactionType()
.equals(ManualRedactionType.ADD) && !entry.getStatus().equals(Status.APPROVED)) {
return;