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

Jump to bottom

Allow users to access annotations of other users (if they know the link) #3348

Merged
merged 2 commits into from
Oct 11, 2018
Merged

Allow users to access annotations of other users (if they know the link) #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7799de
Allow users to access annotations of other users (if they know the link)
fm3 Oct 11, 2018
febb4cd
update changelog
fm3 Oct 11, 2018
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.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
- The UI for editing experience domains of users was improved. [#3254](https://github.com/scalableminds/webknossos/pull/3254)
- The tracing layout was changed to be more compact. [#3256](https://github.com/scalableminds/webknossos/pull/3256)
- It is no longer possible to draw outside of a viewport with the brush tool in volume tracing. [#3283](https://github.com/scalableminds/webknossos/pull/3283)
- Users can now access the annotations of other users (of the same organization) given the link, even if they are non-public. [#3348](https://github.com/scalableminds/webknossos/pull/3348)

### Fixed

Expand Down
5 changes: 3 additions & 2 deletions app/models/annotation/AnnotationRestrictions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package models.annotation

import com.scalableminds.util.accesscontext.GlobalAccessContext
import com.scalableminds.util.tools.{Fox, FoxImplicits}
import javax.inject.Inject
import models.user.{User, UserService}
Expand Down Expand Up @@ -55,9 +56,9 @@ class AnnotationRestrictionDefaults @Inject()(userService: UserService) extends
else
(for {
user <- option2Fox(userOption)
isTeamManagerOrAdminOfTeam <- userService.isTeamManagerOrAdminOf(user, annotation._team)
owner <- userService.findOneById(annotation._user, true)(GlobalAccessContext)
} yield {
annotation._user == user._id || isTeamManagerOrAdminOfTeam
owner._organization == user._organization
}).orElse(Fox.successful(false))
}

Expand Down