fixes #16578 - make keep_param idempotent, remove duplicate call #3853
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
dLobatog
suggested changes
Sep 19, 2016
| @@ -9,6 +9,8 @@ def keep_param(params, top_level_hash, *keys) | |||
| old_params = keys.inject({}) do |op,(key,val)| | |||
| params[top_level_hash].has_key?(key) ? op.update(key => params[top_level_hash].delete(key)) : op | |||
| end | |||
| yield.update old_params | |||
| filtered = yield.update(old_params) | |||
| params[top_level_hash].update old_params | |||
There was a problem hiding this comment.
Please leave a comment here explaining this restores deleted params , I don't think it's very clear at first glance
Using host_params (and keep_param) twice was causing compute_attributes to be deleted permanently out of `params`. keep_param now restores elements it deletes, and the controller now only calls host_params once for efficiency.
domcleal
force-pushed
the
16578-used-tmpls-cattrs
branch
from
6025525
to
130c1c8
Compare
|
@dLobatog comments added for both restoration lines, hopefully it's clearer now. |
dLobatog
approved these changes
Sep 20, 2016
|
Ready to merge if Jenkins tests pass |
|
[test foreman] |
|
[test foreman] as develop changed. |
|
Thanks @domcleal ! |
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.
Using host_params (and keep_param) twice was causing compute_attributes
to be deleted permanently out of
params. keep_param now restoreselements it deletes, and the controller now only calls host_params once
for efficiency.