fix: resolve user role inheritance when adding user to project#3572
Open
aashir-ali wants to merge 2 commits into
Open
fix: resolve user role inheritance when adding user to project#3572aashir-ali wants to merge 2 commits into
aashir-ali wants to merge 2 commits into
Conversation
|
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses incorrect “Inherit” project-role handling when assigning users to a project by preventing “inherit” selections from being persisted as a numeric role value and by treating stored 0 as “no explicit project role” during role resolution.
Changes:
- Adjusts project-role lookup to treat
projectRole = 0as “no explicit role” (inherit global role). - Updates project user relation editing to recognize the
"inherit"UI value and avoid casting it into an integer role.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| app/Domain/Projects/Services/Projects.php | Treats projectRole values that cast to 0 as “no explicit role” when resolving a user’s project role. |
| app/Domain/Projects/Repositories/Projects.php | Prevents "inherit" from being cast and persisted as an integer role when updating project-user relations. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+1052
to
+1054
| if (is_array($project)) { | ||
| if (isset($project[0]['projectRole']) && $project[0]['projectRole'] != '' && (int) $project[0]['projectRole'] !== 0) { | ||
| return (string) $project[0]['projectRole']; |
Comment on lines
+794
to
797
| $roleValue = $values['projectRoles']['userProjectRole-'.$userId] ?? null; | ||
| if ($roleValue !== null && $roleValue !== 'inherit' && $roleValue !== '40' && $roleValue !== '50') { | ||
| $projectRole = (int) $roleValue; | ||
| } |
Comment on lines
792
to
796
| $projectRole = null; | ||
| if (isset($values['projectRoles']['userProjectRole-'.$userId]) && $values['projectRoles']['userProjectRole-'.$userId] != '40' && $values['projectRoles']['userProjectRole-'.$userId] != '50') { | ||
| $projectRole = (int) $values['projectRoles']['userProjectRole-'.$userId]; | ||
| $roleValue = $values['projectRoles']['userProjectRole-'.$userId] ?? null; | ||
| if ($roleValue !== null && $roleValue !== 'inherit' && $roleValue !== '40' && $roleValue !== '50') { | ||
| $projectRole = (int) $roleValue; | ||
| } |
Comment on lines
+1055
to
1063
| if (is_array($project)) { | ||
| if (isset($project[0]['projectRole']) && $project[0]['projectRole'] != '' && (int) $project[0]['projectRole'] !== 0) { | ||
| return (string) $project[0]['projectRole']; | ||
| } else { | ||
| return ''; | ||
| } | ||
| } else { | ||
| return ''; | ||
| } |
This file contains hidden or 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
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.
I have updated the code for the to fix the "Inherit" issue