Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log all details on deleting annotation layer #6950

Merged
merged 3 commits into from
Apr 3, 2023
Merged

Log all details on deleting annotation layer #6950

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22067d2
Log all details on deleting annotation layer
fm3 Mar 28, 2023
9b79757
Merge branch 'master' into delete-layer-log-details
fm3 Mar 30, 2023
e2b60ab
Merge branch 'master' into delete-layer-log-details
fm3 Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/controllers/AnnotationController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,12 @@ class AnnotationController @Inject()(
_ <- bool2Fox(AnnotationType.Explorational.toString == typ) ?~> "annotation.deleteLayer.explorationalsOnly"
annotation <- provider.provideAnnotation(typ, id, request.identity)
_ <- bool2Fox(annotation._user == request.identity._id) ?~> "notAllowed" ~> FORBIDDEN
_ <- annotation.annotationLayers.find(annotationLayer => annotationLayer.name == layerName) ?~> Messages(
layer <- annotation.annotationLayers.find(annotationLayer => annotationLayer.name == layerName) ?~> Messages(
"annotation.layer.notFound",
layerName)
_ <- bool2Fox(annotation.annotationLayers.length != 1) ?~> "annotation.deleteLayer.onlyLayer"
_ = logger.info(s"Deleting annotation layer $layerName for annotation $id")
_ = logger.info(
s"Deleting annotation layer $layerName (tracing id ${layer.tracingId}, typ ${layer.typ}) for annotation $id")
_ <- annotationService.deleteAnnotationLayer(annotation, layerName)
} yield Ok
}
Expand Down