-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
Fix/31863: Don't allow member to edit task in room #32165
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fb35bc3
don't allow member to edit task in room
DylanDylann 83e58ea
fix: lint
DylanDylann 59d4832
merge main
DylanDylann 04c4b7b
add policy expense chat
DylanDylann 178b07e
merge main
DylanDylann de9e6d4
add params to canModifyTask function
DylanDylann 5901627
fix lint
DylanDylann 6992930
update name
DylanDylann d0363a9
fix lint
DylanDylann d8fc0ed
fix lint
DylanDylann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -866,9 +866,11 @@ function getTaskOwnerAccountID(taskReport) { | |
* Check if you're allowed to modify the task - anyone that has write access to the report can modify the task | ||
* @param {Object} taskReport | ||
* @param {Number} sessionAccountID | ||
* @param {String} policyRole | ||
* | ||
* @returns {Boolean} | ||
*/ | ||
function canModifyTask(taskReport, sessionAccountID) { | ||
function canModifyTask(taskReport, sessionAccountID, policyRole = '') { | ||
if (ReportUtils.isCanceledTaskReport(taskReport)) { | ||
return false; | ||
} | ||
|
@@ -877,10 +879,15 @@ function canModifyTask(taskReport, sessionAccountID) { | |
return true; | ||
} | ||
|
||
const parentReport = ReportUtils.getParentReport(taskReport); | ||
|
||
if (policyRole && (ReportUtils.isChatRoom(parentReport) || ReportUtils.isPolicyExpenseChat(parentReport)) && policyRole !== CONST.POLICY.ROLE.ADMIN) { | ||
return false; | ||
} | ||
Comment on lines
+882
to
+886
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For non-member of workspace, Details: #33420 (comment) |
||
|
||
// If you don't have access to the task report (maybe haven't opened it yet), check if you can access the parent report | ||
// - If the parent report is an #admins only room | ||
// - If you are a policy admin | ||
const parentReport = ReportUtils.getParentReport(taskReport); | ||
return ReportUtils.isAllowedToComment(parentReport); | ||
} | ||
|
||
|
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need in this case to get the
ReportUtils.getRootParentReport(report);
first?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated name of props. policyID props here was already policyID of root parent report
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aldo-expensify Updated. please check again