Fixes #26352 - ActiveJob task arguments loading #396
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
iNecas
reviewed
Mar 14, 2019
| @@ -118,7 +118,8 @@ def main_action | |||
| else | |||
| execution_plan_action.input | |||
| end | |||
| @main_action = active_job_action(args['job_class'], args['job_arguments']) | |||
| args = args['job_data'] || args.slice('job_class') | |||
There was a problem hiding this comment.
For the tasks created before this change, shouldn't this be:
args = args['job_data'].try { |data| data['arguments'] } || args['job_arguments']
@main_action = active_job_action(args['job_class'], args['arguments'])There was a problem hiding this comment.
Yes, you are right 👍 thanks.
There was a problem hiding this comment.
One small ask: please add a comment that we need the fallback for job_arguments for fobs from Dynflow <=1.2.1, for the future version of us that would wonder why we're doing this here :)
|
I believe now we are backwards compatible :) |
|
There is one more occurrence of |
|
I have pulled the logic into its method, just left one comment, where I am unsure. |
iNecas
approved these changes
Mar 15, 2019
|
Thanks @ezr-ondrej |
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.
ActiveJob arguments loading is broken by: Dynflow/dynflow#317