Add nil check to serializer for invalid categories #16951
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
|
@miq-bot add_label bug |
bdunne
reviewed
Feb 5, 2018
| @@ -23,7 +23,7 @@ def serialize(dialog_field, all_attributes = false) | |||
|
|
|||
| if dialog_field.type == "DialogFieldTagControl" | |||
| category = Category.find_by(:id => dialog_field.category) | |||
| dialog_field.options.merge!(:category_name => category.name, :category_description => category.description) | |||
| dialog_field.options.merge!(:category_name => category.name, :category_description => category.description) if category.present? | |||
There was a problem hiding this comment.
The present? shouldn't be necessary since find_by will return either a record or nil
|
Checked commit d-m-u@60fde31 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0 |
bdunne
approved these changes
Feb 5, 2018
eclarizio
approved these changes
Feb 5, 2018
simaishi
pushed a commit
that referenced
this pull request
Feb 6, 2018
Add nil check to serializer for invalid categories (cherry picked from commit 0e35ec3) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542606
|
Gaprindashvili backport details: |
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.
Fixes issue with dialog editor not loading on import of dialogs with invalid tag controls.
Fixes 1/2 of https://bugzilla.redhat.com/show_bug.cgi?id=1540713
This bz is two issues: the editor won't load because https://github.com/ManageIQ/manageiq/blob/master/app/models/dialog_field_serializer.rb#L26 returns nil for non-valid categories which this PR fixes, and the editor doesn't correctly save changed, valid categories which is an editor problem (because I can replicate it with the import piece taken out, that is, creating a new dialog with a tag control that has a category, saving it, then editing that dialog and changing the category results in the new category not saving as it should.)