[REF] Fixes a bug in Message Template create API where by user permissions checks were being done on system workflow messages #16788
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
|
(Standard links)
|
|
@seamuslee001 if you want to merge the other & then rebase this over the top of the other I'll approve it. I haven't tested but I think this is trivial enough that I'll just with your judgement on it. |
…mplate with only edit system workflow message templates permission
seamuslee001
force-pushed
the
msg_template_no_id
branch
from
66d7129
to
4dec22b
Compare
seamuslee001
force-pushed
the
msg_template_no_id
branch
from
4dec22b
to
36111e9
Compare
seamuslee001
commented
Mar 16, 2020
| } | ||
| if (!CRM_Core_Permission::check('edit user-driven message templates')) { | ||
| elseif (!CRM_Core_Permission::check('edit user-driven message templates')) { |
There was a problem hiding this comment.
Note that this needs to be elseif so that we don't run the check if workflow_id is set
|
lol- 'wrong' and 'correct' mean? |
|
@seamuslee001 test fail is unrelated so that's all good - but could you flesh out 'wrong' & 'correct' above |
|
Done |
|
cool |
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.
Overview
This fixes a bug when creating a new system workflow message template i.e without an ID and with check_permissions turned on will cause the user message template permission to be checked incorrectly
Before
When user doesn't have edit all message template permission both system workflow and user workflow permissions are checked when adding a new system workflow tempalte
After
Only system workflow template permission is checked
ping @eileenmcnaughton