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

Show only servers in current region in Diagnostics #4849

Merged
merged 1 commit into from
Nov 1, 2018

Conversation

ZitaNemeckova
Copy link
Contributor

Closes #4719 .

Have two Regions each with one or more servers.
Configuration -> Diagnostics -> select Region -> select Servers tab -> see that number of servers in tree and in GTL isn't same

Before:
screen shot 2018-10-30 at 2 29 54 pm
After:
screen shot 2018-10-30 at 2 26 17 pm

@miq-bot add_label bug, hammer/no

@miq-bot
Copy link
Member

miq-bot commented Oct 30, 2018

Checked commit ZitaNemeckova@0aa0421 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 🍪

@ZitaNemeckova
Copy link
Contributor Author

@lpichler Can you look at this one too, please?

@ZitaNemeckova
Copy link
Contributor Author

@miq-bot remove_label hammer/no
@miq-bot add_label hammer/yes

@@ -420,7 +420,7 @@ def diagnostics_server_list
zone = Zone.find_by_id(x_node.split("-").last)
@view, @pages = get_view(MiqServer, :named_scope => [[:with_zone_id, zone.id]]) # Get the records (into a view) and the paginator
else
@view, @pages = get_view(MiqServer) # Get the records (into a view) and the paginator
@view, @pages = get_view(MiqServer, :named_scope => [[:in_region, MiqRegion.my_region.region]]) # Get the records (into a view) and the paginator
Copy link
Contributor

Choose a reason for hiding this comment

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

great! and I believe can also use :in_my_region instead :in_region👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah that works too and looks better. Changed 👍

@mzazrivec mzazrivec self-assigned this Nov 1, 2018
@mzazrivec
Copy link
Contributor

@lpichler Are you OK with the current changes?

@himdel himdel merged commit b897cec into ManageIQ:master Nov 1, 2018
@himdel himdel added this to the Sprint 98 Ending Nov 5, 2018 milestone Nov 1, 2018
simaishi pushed a commit that referenced this pull request Nov 2, 2018
Show only servers in current region in Diagnostics

(cherry picked from commit b897cec)
@simaishi
Copy link
Contributor

simaishi commented Nov 2, 2018

Hammer backport details:

$ git log -1
commit ceaac8074631d3aae7b6bb64f858e03af8c4d609
Author: Martin Hradil <himdel@seznam.cz>
Date:   Thu Nov 1 16:01:46 2018 +0100

    Merge pull request #4849 from ZitaNemeckova/filter_servers
    
    Show only servers in current region in Diagnostics
    
    (cherry picked from commit b897cec003ef2a17e571b07fa6f5d024486caec9)

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