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

[FINE] Corrects sections and their names in New Subnet form #3275

Merged
merged 1 commit into from
Mar 15, 2018
Merged

[FINE] Corrects sections and their names in New Subnet form #3275

merged 1 commit into from
Mar 15, 2018

Conversation

petrblaho
Copy link

@petrblaho petrblaho commented Jan 18, 2018

solves https://bugzilla.redhat.com/show_bug.cgi?id=1535369

Steps for Testing/QA

  1. Add OpenStack provider
  2. Networks > Subnets
  3. Configuration > Add a new Cloud Subnet

Results without patch:
Form on page has wrong form section captions. Original BZ can describe little different parts b/c #3254 got merged in the meantime.

Results with patch (expected):
Form on page has "Network Provider", "Placement" and "Cloud Subnet details" sections.

Backport of #3148

@miq-bot
Copy link
Member

miq-bot commented Jan 18, 2018

Checked commit https://github.com/petrblaho/manageiq-ui-classic/commit/21f3bd3758e23fd2e0765f5271a49a85890f4382 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍰

@dclarizio
Copy link

@petrblaho can you please add screenshots? Thanks, Dan

@petrblaho
Copy link
Author

@dclarizio sure!

Before Network Manager is chosen:
screenshot-2018-1-19 manageiq cloud subnets

After Network Manager is chosen:
screenshot-2018-1-19 manageiq cloud subnets 1

@dclarizio
Copy link

@petrblaho I just noticed this PR is for Fine only, is there a corresponding fix for Gaprindashvili or is this not an issue there? We normally fix bugs upstream, then back port them.

@martinpovolny martinpovolny changed the title [Fine] Corrects sections and their names in New Subnet form [FINE] Corrects sections and their names in New Subnet form Jan 19, 2018
@petrblaho
Copy link
Author

@dclarizio Gaprindashvili and master is working correctly.

I have seen some bigger refactoring in this file's history in Gaprindashvili and master and it was dependant on some other feature with I believe is not in Fine.

So this patch is Fine only b/c some changes were not backported to Fine in the past.

@petrblaho
Copy link
Author

The latest common commit in history of that view template is e98fc97 from Jan 2017.

Then there was a lot of changes with section changes in 51d030c#diff-338ecb79799bff25e172f8849a48dbbd which did not went into Fine branch.

There is #3148 which was backported to Gaprindashvili but not to Fine. Maybe backport it to Fine too instead of this one?

@simaishi
Copy link
Contributor

Backport of #3148 will conflict, so I think we can take this. I will mark this as a backport of that PR.

@dclarizio are you good with this change?

@dclarizio
Copy link

Backport of #3148 will conflict, so I think we can take this. I will mark this as a backport of that PR.

@dclarizio are you good with this change?

I think that is a question for @petrblaho . . . @petrblaho, can you confirm this should be merged as a backport of #3148?

@petrblaho
Copy link
Author

@dclarizio @simaishi yes, in the end both BZs describe and both PRs solve the same issue - wrong sections and nesting of elements in template around the same two sections (differences are here b/c of other newer changes not present in Fine)

@dclarizio
Copy link

@simaishi good to go

@simaishi simaishi merged commit 4f77e8e into ManageIQ:fine Mar 15, 2018
@simaishi simaishi added this to the Sprint 82 Ending Mar 26, 2018 milestone Mar 15, 2018
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