From 73b697cba3438fb2506b8af764673337df752b58 Mon Sep 17 00:00:00 2001 From: Florian M Date: Tue, 26 Mar 2024 15:04:08 +0100 Subject: [PATCH 1/2] List teamless users --- CHANGELOG.unreleased.md | 1 + app/models/user/User.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 9c9b0844701..4b6ce60dd78 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -18,6 +18,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released - The time tracking api route `/api/users/:id/loggedTime`, which is used by the webknossos-libs client, and groups the times by month, now uses UTC when determining month limits, rather than the server’s local timezone. [#7524](https://github.com/scalableminds/webknossos/pull/7524) ### Fixed +- Fixed a bug where users that have no team memberships were omitted from the user list. ### Removed diff --git a/app/models/user/User.scala b/app/models/user/User.scala index b643235edc3..bdd5f65aa53 100644 --- a/app/models/user/User.scala +++ b/app/models/user/User.scala @@ -276,7 +276,7 @@ class UserDAO @Inject()(sqlClient: SqlClient)(implicit ec: ExecutionContext) ARRAY_REMOVE(ARRAY_AGG(utr.isteammanager :: TEXT), null) AS team_managers FROM webknossos.users AS u LEFT JOIN webknossos.user_team_roles utr on utr._user = u._id - INNER JOIN webknossos.teams t on t._id = utr._team + LEFT JOIN webknossos.teams t on t._id = utr._team -- should not cause fanout since there is only one team per team_role GROUP BY u._id ) SELECT From bf2106c0bfd4bbed3c0b13b1b61017cae5f65dba Mon Sep 17 00:00:00 2001 From: Florian M Date: Tue, 26 Mar 2024 15:07:29 +0100 Subject: [PATCH 2/2] pr num in changelog --- CHANGELOG.unreleased.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 4b6ce60dd78..082bf9bb53b 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -18,7 +18,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released - The time tracking api route `/api/users/:id/loggedTime`, which is used by the webknossos-libs client, and groups the times by month, now uses UTC when determining month limits, rather than the server’s local timezone. [#7524](https://github.com/scalableminds/webknossos/pull/7524) ### Fixed -- Fixed a bug where users that have no team memberships were omitted from the user list. +- Fixed a bug where users that have no team memberships were omitted from the user list. [#7721](https://github.com/scalableminds/webknossos/pull/7721) ### Removed