Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Pull request #109: RED-1008: Remove from dictionary action must not appear for non-dictionary entries

Browse Source 
Merge in RED/ui from RED-1008 to master

* commit '7c68898ee4789b9863b7e9d12603230681c01870':
  Remove from dictionary action must not appear for non-dictionary entries
This commit is contained in:
Timo Bejan 2021-01-27 22:01:14 +01:00
commit 3624806733
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/common/service/annotation-actions.service.ts
View File

@ -23,7 +23,6 @@ export class AnnotationActionsService {
public acceptSuggestion($event: MouseEvent, annotation: AnnotationWrapper, annotationsChanged: EventEmitter<AnnotationWrapper>) {
$event?.stopPropagation();
console.log(annotation.isModifyDictionary);
this._processObsAndEmit(this._manualAnnotationService.approveRequest(annotation.id, annotation.isModifyDictionary), annotation, annotationsChanged);
}

2
apps/red-ui/src/app/screens/file/model/annotation.permissions.ts
View File

@ -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));