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

Being dataset uploader does not make editable true #7200

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Being dataset uploader does not make editable true #7200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75d83fa
Being dataset uploader does not make editable true
frcroth Jul 11, 2023
91fdc94
Update changelog
frcroth Jul 11, 2023
5c191a6
Merge branch 'master' into uploader-not-editable
frcroth Jul 18, 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
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 @@ -26,6 +26,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- The proofreading tool is always visible now (even when disabled). [#7174](https://github.com/scalableminds/webknossos/pull/7174)
- Optimized processing of parallel requests (new thread pool configuration, asynchronous FossilDB client), improving performance and reducing idle waiting. [#7139](https://github.com/scalableminds/webknossos/pull/7139)
- Renamed "open" tasks to "pending" and slightly redesigned the available task assignment view for clarity. [#7187](https://github.com/scalableminds/webknossos/pull/7187)
- Being the uploader of a dataset no longer grants edit permissions on that dataset. [#7200](https://github.com/scalableminds/webknossos/pull/7200)

### Fixed
- Fixed rare rendering bug at viewport edge for anisotropic datasets. [#7163](https://github.com/scalableminds/webknossos/pull/7163)
Expand Down
1 change: 0 additions & 1 deletion app/models/binary/DataSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ class DataSetDAO @Inject()(sqlClient: SqlClient,
(
(u.isAdmin AND u._organization = d._organization) OR
u.isDatasetManager OR
d._uploader = u._id OR
d._id IN ( -- team manager of team that has access to the dataset
SELECT _dataSet
FROM webknossos.dataSet_allowedTeams dt
Expand Down
1 change: 0 additions & 1 deletion app/models/binary/DataSetService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
} yield
(user.isAdminOf(dataSet._organization)
|| user.isDatasetManager
|| dataSet._uploader.contains(user._id)
|| teamManagerMemberships.map(_.teamId).intersect(dataSetAllowedTeams).nonEmpty)
case _ => Fox.successful(false)
}
Expand Down