Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GAPRINDASHVILI] Add flag for init of defaults in fields on g #18099

Merged

Conversation

d-m-u
Copy link
Contributor

@d-m-u d-m-u commented Oct 15, 2018

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1639413

We needed a separate PR for the gap branch for #18061... I have no idea why the main version caused merge conflicts cause it's the exact same stuff in the same places.

At this point if a service dialog gets ordered via the API, it will not honor defaults on static fields. To remedy this, this adds a flag to the call to also let us call load_values_into_fields(values, false), thus honoring the default values. This builds on the recent changes to #17844

@miq-bot miq-bot changed the title Add flag for init of defaults in fields on g [GAPRINDASHVILI] Add flag for init of defaults in fields on g Oct 15, 2018
@miq-bot
Copy link
Member

miq-bot commented Oct 15, 2018

Checked commit d-m-u@be4d802 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
4 files checked, 0 offenses detected
Everything looks fine. 🍪

@d-m-u
Copy link
Contributor Author

d-m-u commented Oct 15, 2018

@miq-bot add_label blocker, bug

@d-m-u
Copy link
Contributor Author

d-m-u commented Oct 15, 2018

@bdunne @tinaafitz @gmcculloug can you please approve this, it's the g/branch version of the blocker that you all just approved that's holding up today's release...

@simaishi
Copy link
Contributor

I have no idea why the main version caused merge conflicts cause it's the exact same stuff in the same places.

I think the conflict was caused by G branch having

      let(:arg2) { {:initiator => 'control'} }

right above where you added the new test...

@tinaafitz
Copy link
Member

@d-m-u Looks good.

@simaishi simaishi merged commit 5f1530c into ManageIQ:gaprindashvili Oct 15, 2018
@simaishi simaishi added this to the Sprint 97 Ending Oct 22, 2018 milestone Oct 15, 2018
@d-m-u d-m-u deleted the fixing_merge_conflict_on_bz1635673 branch February 1, 2019 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants