Fix Approval Node Edit Permissions #8253
Merged
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
|
Build succeeded.
|
ryanpetrello
approved these changes
Sep 28, 2020
There was a problem hiding this comment.
Looks reasonable to me, but I helped write it, so I'd say let's see what @AlanCoding thinks.
AlanCoding
reviewed
Sep 29, 2020
awx/main/access.py
Outdated
| @@ -2750,6 +2750,9 @@ def can_add(self, data): | |||
| else: | |||
| return (self.check_related('workflow_approval_template', UnifiedJobTemplate, role_field='admin_role')) | |||
|
|
|||
| def can_change(self, obj, data): | |||
| return self.user.can_access(WorkflowJobTemplate, 'change', obj.workflow_job_template, data=data) | |||
There was a problem hiding this comment.
Instead of passing data=data, I would much prefer data={}. The data you get contain fields for modification of the workflow approval template, not fields for the WFJT, which is how it would be interpreted in this call.
I'm also happy to take your word that the approval node's WFJT cannot be modified and cannot be null, so that this is not complicated further.
There was a problem hiding this comment.
Agreed, data={} is probably what we want here.
beeankha
force-pushed
the
edit_approval_node_bugfix
branch
from
d84be5c to
f584c1c
Compare
|
Build succeeded.
|
ryanpetrello
approved these changes
Sep 29, 2020
|
Build succeeded (gate pipeline).
|
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.
SUMMARY
Currently, users with the proper org/wfjt admin permissions are unable to edit approval nodes in workflow job templates that they should have edit permissions for. This PR should fix that bug.
ISSUE TYPE
COMPONENT NAME
AWX VERSION
ADDITIONAL INFORMATION