Fixes #5816 - allow editing and displaying self via API #3379
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
| @@ -351,7 +351,10 @@ def can_change_admin_flag? | |||
| def editing_self?(options = {}) | |||
| options[:controller].to_s == 'users' && | |||
| options[:action] =~ /edit|update/ && | |||
| options[:id].to_i == self.id | |||
| options[:id].to_i == self.id || | |||
| options[:controller].to_s =~ /api\/v\d+\/users/ && | |||
There was a problem hiding this comment.
I would rather check for whole match /\A/api\/v\d+\/users/\Z/, just to prevent a case, where we would have users.+ controller in the future - not expecting but still, it's better safe than sorry.
|
Tested and works well 👍 |
|
one nitpick |
dLobatog
added
Waiting on contributor
and removed
Needs testing
Not yet reviewed
labels
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
thanks @iNecas, fixed... test failure seems unrelated |
|
For the record, I filed that error as http://projects.theforeman.org/issues/14414 today. |
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.
No description provided.