Dashboard annotation list: skip deleted annotations (#7628)

* Dashboard annotation list: skip deleted annotations * num in changelog
scalableminds · Feb 15, 2024 · 6ac0a01 · 6ac0a01
1 parent 830ff9e
commit 6ac0a01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -32,9 +32,9 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Fixed a bug in ND volume annotation downloads where the additionalAxes metadata had wrong indices. [#7592](https://github.com/scalableminds/webknossos/pull/7592)
 - Fixed a bug in proofreading aka editable mapping annotations where splitting would sometimes give the new id to the selected segment rather than to the split-off one. [#7608](https://github.com/scalableminds/webknossos/pull/7608)
 - Fixed small styling errors as a follow up to the antd v5 upgrade [#7612](https://github.com/scalableminds/webknossos/pull/7612)
--Fixed deprecation warnings caused by Antd <Collapse> components. [#7610](https://github.com/scalableminds/webknossos/pull/7610)
+- Fixed deprecation warnings caused by Antd <Collapse> components. [#7610](https://github.com/scalableminds/webknossos/pull/7610)
 - Fixed small styling error with a welcome notification for new users on webknossos.org. [7623](https://github.com/scalableminds/webknossos/pull/7623)
-
+- Fixed a bug where the annotation list in the dashboard would attempt to display deleted annotations, and then fail. [#7628](https://github.com/scalableminds/webknossos/pull/7628)
 
 ### Removed
 

diff --git a/app/models/annotation/Annotation.scala b/app/models/annotation/Annotation.scala
@@ -346,7 +346,7 @@ class AnnotationDAO @Inject()(sqlClient: SqlClient, annotationLayerDAO: Annotati
           ARRAY_REMOVE(ARRAY_AGG(al.name), null) AS tracing_names,
           ARRAY_REMOVE(ARRAY_AGG(al.typ :: varchar), null) AS tracing_typs,
           ARRAY_REMOVE(ARRAY_AGG(al.statistics), null) AS annotation_layer_statistics
-      FROM webknossos.annotations as a
+      FROM webknossos.annotations_ as a
                LEFT JOIN webknossos.users_ u
                          ON u._id = a._user
                LEFT JOIN webknossos.annotation_sharedteams ast