[dicom_archive] Dicom archive siteproject main #9549
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ridz1208
added
Release: Add to release notes
ridz1208
commented
Feb 4, 2025
Comment on lines
139
to
150
| // Check if resources with null should be included in the result set | ||
| if (!empty($this->nullProjectPermissionNames())) { | ||
| $provisioner = $provisioner->filter( | ||
| new \LORIS\Data\Filters\NullProjectOrUserProjectMatch( | ||
| $this->nullProjectPermissionNames() | ||
| ) | ||
| ); | ||
| } else { | ||
| $provisioner = $provisioner->filter( | ||
| new \LORIS\Data\Filters\UserProjectMatch() | ||
| ); | ||
| } |
There was a problem hiding this comment.
changes should be removed as module defines its own version of this function
ridz1208
force-pushed
the
dicom_archive_siteproject_main
branch
6 times, most recently
from
6704ee9 to
01cc574
Compare
ridz1208
commented
Feb 7, 2025
| @@ -92,6 +123,75 @@ class Dicom_Archive extends \DataFrameworkMenu | |||
| return $provisioner; | |||
| } | |||
|
|
|||
| /** | |||
ridz1208
changed the title
DA refactor undo changes dataframework Update dicom_archive.class.inc Update viewdetails.class.inc Update viewdetails.class.inc double session
ridz1208
force-pushed
the
dicom_archive_siteproject_main
branch
from
01cc574 to
68c9763
Compare
ridz1208
removed
the
State: Needs documentation
|
Your PR is working correctly. Once you rebase and fix the grammar/typos, this can be merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Brief summary of changes
This PR adds advanced site and project permissions to the dicom archive. It is designed to be fully backwards compatible based on the
useImagingSiteProjectPermissionsconfiguration setting. Here is how the permissions are designed to workTO BE NOTED: The core of this PR is the work done in the
dicom_archive::getDataProvisionerWithFilters()function. The code there could have been made slightly more concise but I wrote it in that way because I would like it to eventually become the DEFAULT dataframework filtering logic since it accounts for most if not all usecases (replacing the current UserSiteMAtchOrHasAnyPermissions). It defines flags that I would like to make standard going forward likedataSessionCanBeNullwhere multiple module seem to lack a session related to the resource.TODO:
Testing instructions (if applicable)
Link(s) to related issue(s)