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

Made changes to save server name only if it is not blank #4730

Conversation

h-kataria
Copy link
Contributor

@h-kataria h-kataria commented Oct 3, 2018

Also fixed the check that compares previously saved value against the value from miq_server record instead of checking @update.config[:server][:name] server/name key did not exist in settings.yml so the condition always returned true.

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

@yrudman please test

@h-kataria
Copy link
Contributor Author

@yrudman Fix was made in #4232 to read appliance name value from miq_server record, not backported yet to Gaprindashvili.

@dclarizio
Copy link

@h-kataria can you try to fix the CC issue?

@h-kataria h-kataria force-pushed the dont_allow_blank_appliance_name_for_server branch from db267f4 to 975f5dd Compare October 3, 2018 20:48
Also fixed the check that compares previously saved value against the value from miq_server record instead of checking `@update.config[:server][:name]` server/name key did not exist in settings.yml so the condition always returned true.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1634518
@h-kataria h-kataria force-pushed the dont_allow_blank_appliance_name_for_server branch from 975f5dd to 9680941 Compare October 3, 2018 21:12
@miq-bot
Copy link
Member

miq-bot commented Oct 3, 2018

Checked commit h-kataria@9680941 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 1 offense detected

app/controllers/ops_controller/settings/common.rb

@h-kataria
Copy link
Contributor Author

@dclarizio fixed cc issue.

@dclarizio dclarizio merged commit 5078295 into ManageIQ:master Oct 3, 2018
@dclarizio dclarizio added this to the Sprint 96 Ending Oct 8, 2018 milestone Oct 3, 2018
simaishi pushed a commit that referenced this pull request Oct 4, 2018
…me_for_server

Made changes to save server name only if it is not blank

(cherry picked from commit 5078295)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1634518
@simaishi
Copy link
Contributor

simaishi commented Oct 4, 2018

Hammer backport details:

$ git log -1
commit f51dafbbb99b77c5812d1dbc405efdb67e1f33c5
Author: Dan Clarizio <dclarizi@redhat.com>
Date:   Wed Oct 3 15:39:22 2018 -0700

    Merge pull request #4730 from h-kataria/dont_allow_blank_appliance_name_for_server
    
    Made changes to save server name only if it is not blank
    
    (cherry picked from commit 50782950894f776f5d37e3fe1aa5c174737451c0)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1634518

@h-kataria
Copy link
Contributor Author

backporting this PR to Gaprindashvili, should fix https://bugzilla.redhat.com/show_bug.cgi?id=1635178

@h-kataria h-kataria deleted the dont_allow_blank_appliance_name_for_server branch October 24, 2018 22:04
@simaishi
Copy link
Contributor

simaishi commented Nov 5, 2018

@h-kataria Both files conflict backporting to Gaprindashvili branch. Please create a separate PR

@simaishi
Copy link
Contributor

simaishi commented Nov 6, 2018

Backported to Gaprindashvili via #4876

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.

None yet

4 participants