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

Reverse-merge tree params if the tree is already in the sandbox #1830

Merged
merged 1 commit into from
Aug 9, 2017

Conversation

skateman
Copy link
Member

@skateman skateman commented Aug 4, 2017

If the tree was already in the sandbox, the updated params were simply ignored. This causes issues when loading an explorer screen with a tree. The reverse-merging doesn't change the already set values for a tree, just adds the new ones that will fix the issue.

Steps to reproduce:

  1. Make sure you have a clean browser session
  2. Go to the summary screen of a Provider/VM/Host
  3. Navigate to a related Datastore
  4. The tree on the left side is broken

screenshot from 2017-08-04 12-27-28

After this fix:
screenshot from 2017-08-04 12-31-17

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

If the tree was already in the sandbox, the updated params were
simply ignored. This causes issues when loading an explorer screen
with a tree. The reverse-merging doesn't change the already set
values for a tree, just adds the new ones that will fix the issue.

https://bugzilla.redhat.com/show_bug.cgi?id=1478355
@skateman skateman force-pushed the fix-datastore-relationload branch from 1b9743d to 48fd58e Compare August 7, 2017 09:06
@miq-bot
Copy link
Member

miq-bot commented Aug 7, 2017

Checked commit skateman@48fd58e with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks fine. 🍰

@miq-bot miq-bot added the bug label Aug 7, 2017
@martinpovolny martinpovolny added this to the Sprint 67 Ending Aug 21, 2017 milestone Aug 9, 2017
@martinpovolny martinpovolny merged commit 0591c6e into ManageIQ:master Aug 9, 2017
@skateman skateman deleted the fix-datastore-relationload branch August 9, 2017 13:13
simaishi pushed a commit that referenced this pull request Aug 9, 2017
Reverse-merge tree params if the tree is already in the sandbox
(cherry picked from commit 0591c6e)

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

simaishi commented Aug 9, 2017

Fine backport details:

$ git log -1
commit d8b3d48054740c2418a2faf4d9ea82164e31761e
Author: Martin Povolny <[email protected]>
Date:   Wed Aug 9 15:08:51 2017 +0200

    Merge pull request #1830 from skateman/fix-datastore-relationload
    
    Reverse-merge tree params if the tree is already in the sandbox
    (cherry picked from commit 0591c6ed187c3b082de29de5a72cff590dac6e6e)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1480002

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.

6 participants