From 7c68898ee4789b9863b7e9d12603230681c01870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 27 Jan 2021 21:26:20 +0200 Subject: [PATCH] Remove from dictionary action must not appear for non-dictionary entries --- .../red-ui/src/app/common/service/annotation-actions.service.ts | 1 - .../red-ui/src/app/screens/file/model/annotation.permissions.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/common/service/annotation-actions.service.ts b/apps/red-ui/src/app/common/service/annotation-actions.service.ts index cb5572ed8..36e8e6025 100644 --- a/apps/red-ui/src/app/common/service/annotation-actions.service.ts +++ b/apps/red-ui/src/app/common/service/annotation-actions.service.ts @@ -23,7 +23,6 @@ export class AnnotationActionsService { public acceptSuggestion($event: MouseEvent, annotation: AnnotationWrapper, annotationsChanged: EventEmitter) { $event?.stopPropagation(); - console.log(annotation.isModifyDictionary); this._processObsAndEmit(this._manualAnnotationService.approveRequest(annotation.id, annotation.isModifyDictionary), annotation, annotationsChanged); } diff --git a/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts b/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts index ca29bb35a..2f099cd82 100644 --- a/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts +++ b/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts @@ -22,7 +22,7 @@ export class AnnotationPermissions { permissions.canMarkAsFalsePositive = annotation.canBeMarkedAsFalsePositive; permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted; - permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isRedacted && !annotation.isManualRedaction; + permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isRedacted && !annotation.isManualRedaction && annotation.isModifyDictionary; permissions.canAcceptSuggestion = user.isManager && (annotation.isSuggestion || annotation.isDeclinedSuggestion); permissions.canRejectSuggestion = user.isManager && (annotation.isSuggestion || (annotation.isReadyForAnalysis && !permissions.canUndo));