Include reflections of descendant classes when building model details for reporting and expression editors #5506
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@gmcculloug @dclarizio @bzwei Please review |
|
LGTM |
gtanzillo
force-pushed
the
bz-1236001-cloud-tenant-in-conditions
branch
from
2b54ce6
to
d8371f2
Compare
| refs = model.reflections_with_virtual | ||
| model.descendants.each do |desc| | ||
| refs.reverse_merge!(desc.reflections_with_virtual) | ||
| end if model.respond_to?(:include_descendant_classes_in_expressions?) && model.include_descendant_classes_in_expressions? |
There was a problem hiding this comment.
You can use try here. try will also return nil if the receiver does not respond to the method. I also prefer seeing the if condition upfront, but I'll leave that up to you.
if model.try(:include_descendant_classes_in_expressions?)
model.descendants.each { |desc| refs.reverse_merge!(desc.reflections_with_virtual) }
endThere was a problem hiding this comment.
Making that change now. Much nicer. Thanks.
gtanzillo
force-pushed
the
bz-1236001-cloud-tenant-in-conditions
branch
from
d8371f2
to
b60d546
Compare
| it "includes reflections from descendant classes of Host" do | ||
| relats = MiqExpression.get_relats(Host) | ||
| relats[:reflections][:cloud_networks].should_not be_blank | ||
| end |
There was a problem hiding this comment.
@gtanzillo Please add a negative test here using a class that does not respond to include_descendant_classes_in_expressions?
gtanzillo
force-pushed
the
bz-1236001-cloud-tenant-in-conditions
branch
from
b60d546
to
474a94f
Compare
|
LGTM |
|
@dclarizio Please review/merge. |
| @@ -1031,6 +1033,9 @@ en: | |||
| miq_custom_attribute: EVM Custom Attribute | |||
| miq_custom_attributes: EVM Custom Attributes | |||
| miq_event_definition: Event | |||
| manageiq_providers_foreman_configuration_manager_configuration_profile: Confirugation Profile (Foreman) | |||
|
Besides the typo in my comment above, this looks ready to go to me. |
… for reporting and expression editors - Enabled only for Vm and Host models - Enables inclusion of cloud tenants under an openstack VM in reports and expressions - Enables inclusion of cloud networks under an openstack Host https://bugzilla.redhat.com/show_bug.cgi?id=1236001
gtanzillo
force-pushed
the
bz-1236001-cloud-tenant-in-conditions
branch
from
474a94f
to
a7597b6
Compare
|
Typo fixed, thanks @dclarizio |
|
Checked commit gtanzillo@a7597b6 with ruby 1.9.3, rubocop 0.34.2, and haml-lint 0.13.0 app/models/miq_expression.rb
|
gmcculloug
added a commit
that referenced
this pull request
Nov 20, 2015
…nditions Include reflections of descendant classes when building model details for reporting and expression editors
h-kataria
pushed a commit
to h-kataria/manageiq
that referenced
this pull request
Jan 15, 2016
Include reflections of descendant classes when building model details for report ing and expression editors - Enabled only for Vm and Host models - Enables inclusion of cloud tenants under an openstack VM in reports and expressions - Enables inclusion of cloud networks under an openstack Host https://bugzilla.redhat.com/show_bug.cgi?id=1291724 Cherry-picked from ManageIQ#5506 Cherry-pick was not clean. There were conflicts in config/locales/en.yml which I resolved. See merge request !624
gtanzillo
added a commit
that referenced
this pull request
Nov 15, 2017
…e19a887cd85c72d1f8f08 Fix Expression builder argument error by reverting #5506
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
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://bugzilla.redhat.com/show_bug.cgi?id=1236001