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

Fix Expression builder argument error by reverting #5506 #16255

Conversation

imtayadeway
Copy link
Contributor

This attempts to fix old bug https://bugzilla.redhat.com/show_bug.cgi?id=1236001 by reverting #5506 (the original solution) and adding tenants to the list of inclusion tables.

I'm struggling to understand the original bug, which complained about "Tenant" not being available in Vm or Instance conditions. The solution was to add cloud tenants instead, which is the thing that breaks the bug below. As I understand it, this solution fixes both these bugs. But I'm sure there are some things I'm missing, so I'd like to discuss before proceeding.

/cc @gtanzillo @yrudman

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

@miq-bot add-label bug
@miq-bot assign @gtanzillo

… details for reporting and expression editors"

This reverts commit a7597b6.

Conflicts:
	app/models/host.rb
	app/models/miq_expression.rb
	config/locales/en.yml
	spec/models/miq_expression/miq_expression_spec.rb
@miq-bot
Copy link
Member

miq-bot commented Oct 20, 2017

Checked commits imtayadeway/manageiq@7a5dc8e~...9837f2f with ruby 2.3.3, rubocop 0.47.1, and haml-lint 0.20.0
4 files checked, 0 offenses detected
Everything looks fine. 🍰

@imtayadeway imtayadeway reopened this Oct 20, 2017
@Fryguy
Copy link
Member

Fryguy commented Oct 21, 2017

cc @chrisarcand

@imtayadeway imtayadeway changed the title Revert #5506 Fix Expression builder argument error by reverting #5506 Oct 23, 2017
Copy link
Member

@gtanzillo gtanzillo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@gtanzillo gtanzillo added this to the Sprint 74 Ending Nov 27, 2017 milestone Nov 15, 2017
@gtanzillo gtanzillo merged commit 075ae85 into ManageIQ:master Nov 15, 2017
simaishi pushed a commit that referenced this pull request Nov 17, 2017
…e19a887cd85c72d1f8f08

Fix Expression builder argument error by reverting #5506
(cherry picked from commit 075ae85)

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

Gaprindashvili backport details:

$ git log -1
commit f99a288df5821fe00f5564ae54b4a939f505e07b
Author: Gregg Tanzillo <gtanzill@redhat.com>
Date:   Wed Nov 15 15:42:11 2017 -0500

    Merge pull request #16255 from imtayadeway/revert-a7597b65273b9c6089ee19a887cd85c72d1f8f08
    
    Fix Expression builder argument error by reverting #5506
    (cherry picked from commit 075ae852f5f9a36f3de699c62a27de8ce704e7f3)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1514257

simaishi pushed a commit that referenced this pull request Nov 20, 2017
…e19a887cd85c72d1f8f08

Fix Expression builder argument error by reverting #5506
(cherry picked from commit 075ae85)

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

Fine backport details:

$ git log -1
commit c636e68dea71e869220c8b58d03649fed228bf08
Author: Gregg Tanzillo <gtanzill@redhat.com>
Date:   Wed Nov 15 15:42:11 2017 -0500

    Merge pull request #16255 from imtayadeway/revert-a7597b65273b9c6089ee19a887cd85c72d1f8f08
    
    Fix Expression builder argument error by reverting #5506
    (cherry picked from commit 075ae852f5f9a36f3de699c62a27de8ce704e7f3)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1514258

d-m-u pushed a commit to d-m-u/manageiq that referenced this pull request Jun 6, 2018
…b9c6089ee19a887cd85c72d1f8f08

Fix Expression builder argument error by reverting ManageIQ#5506
(cherry picked from commit 075ae85)

https://bugzilla.redhat.com/show_bug.cgi?id=1514258
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.

5 participants