Remove options[:user_message] during miq_request_task creation. #17084
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
|
@mkanoor Please review. |
gmcculloug
reviewed
Mar 5, 2018
app/models/miq_request.rb
Outdated
| @@ -559,6 +559,7 @@ def my_records | |||
| def clean_up_keys_for_request_task | |||
| req_task_attributes = attributes.dup | |||
| (req_task_attributes.keys - MiqRequestTask.column_names + REQUEST_UNIQUE_KEYS).each { |key| req_task_attributes.delete(key) } | |||
| req_task_attributes["options"].delete(:user_message) if req_task_attributes["options"][:user_message] | |||
There was a problem hiding this comment.
@tinaafitz No need for the if check here, just call the delete method unconditionally.
method calls the user_message method during approval. The request options are copied to each miq_request_task at task creation which causes a problem during update_and_notify_parent. Removing the task options[:user_message] resolves the issue. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1482197
tinaafitz
force-pushed
the
remove_user_message_from_task
branch
from
3abbbf2 to
84a8c84
Compare
|
Checked commit tinaafitz@84a8c84 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
gmcculloug
approved these changes
Mar 6, 2018
simaishi
pushed a commit
that referenced
this pull request
Mar 8, 2018
Remove options[:user_message] during miq_request_task creation. (cherry picked from commit 330eb50) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1553408
|
Gaprindashvili backport details: |
simaishi
pushed a commit
that referenced
this pull request
Apr 9, 2018
Remove options[:user_message] during miq_request_task creation. (cherry picked from commit 330eb50) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1553409
|
Fine backport details: |
d-m-u
pushed a commit
to d-m-u/manageiq
that referenced
this pull request
Jun 6, 2018
…from_task Remove options[:user_message] during miq_request_task creation. (cherry picked from commit 330eb50) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1553409
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.
The miq_request options[:user_message] gets added when an Automate
method calls the user_message method during approval.
The request options are copied to each miq_request_task at task creation which
causes a problem during update_and_notify_parent.
Removing the task options[:user_message] resolves the issue.
calls the update_and_notify_parent with the display_message method:
https://github.com/ManageIQ/manageiq/blob/master/app/models/miq_request_task.rb#L85
uses the user_message, if available:
https://github.com/ManageIQ/manageiq/blob/master/app/models/mixins/miq_request_mixin.rb#L13
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1482197
@miq-bot assign @gmcculloug
@miq-bot add_label bug, fine/yes, gaprindashvili/yes