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

Allow downloading tasks of teams you are not in #8155

Merged
merged 5 commits into from
Oct 30, 2024
Merged

Allow downloading tasks of teams you are not in #8155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e7a008
Allow downloading tasks of teams you are not in
fm3 Oct 29, 2024
d645e79
changelog
fm3 Oct 29, 2024
babb046
Merge branch 'master' into download-task-of-other-team
fm3 Oct 29, 2024
9b3a195
fix error msg
fm3 Oct 29, 2024
16e6b90
Merge branch 'download-task-of-other-team' of github.com:scalablemind…
fm3 Oct 29, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fixed sorting of mags in outbound zarr streaming. [#8125](https://github.com/scalableminds/webknossos/pull/8125)
- Fixed a bug where you could not create annotations for public datasets of other organizations. [#8107](https://github.com/scalableminds/webknossos/pull/8107)
- Users without edit permissions to a dataset can no longer delete sharing tokens via the API. [#8083](https://github.com/scalableminds/webknossos/issues/8083)
- Fixed downloading task annotations of teams you are not in, when accessing directly via URI. [#8155](https://github.com/scalableminds/webknossos/pull/8155)
fm3 marked this conversation as resolved.
Show resolved Hide resolved

### Removed

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/AnnotationIOController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ class AnnotationIOController @Inject()(
tracingStoreClient.getSkeletonTracing(skeletonAnnotationLayer, skeletonVersion)
} ?~> "annotation.download.fetchSkeletonLayer.failed"
user <- userService.findOneCached(annotation._user)(GlobalAccessContext) ?~> "annotation.download.findUser.failed"
taskOpt <- Fox.runOptional(annotation._task)(taskDAO.findOne)
taskOpt <- Fox.runOptional(annotation._task)(taskDAO.findOne(_)(GlobalAccessContext)) ?~> "team.notFound"
fm3 marked this conversation as resolved.
Show resolved Hide resolved
nmlStream = nmlWriter.toNmlStream(
name,
fetchedSkeletonLayers ::: fetchedVolumeLayers,
Expand Down
2 changes: 1 addition & 1 deletion conf/messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ auth.token.noUser=Could not determine user for access token
team.created=Team was created successfully
team.admin.notPossibleBy=User {1} cannot be assigned administrative rights in team {0} because he does not belong to the teams parent team.
team.admin.notAllowed=You are not authorized to administrate this team.
team.notFound=Team could not be found.
team.notFound=Team could not be found or accessed.
team.nameInUse=This name is already assigned to a different team and not available anymore. Please choose a different name.
team.delete.organizationTeam=This team cannot be deleted. Each organization requires at least one base team.
team.delete.inUse=Team cannot be deleted as it is referenced in an at least one annotation, project or task type
Expand Down