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

Check for cockpit_ws server role to enable Web Console button #2285

Merged

Conversation

bmclaughlin
Copy link
Contributor

Added additional check to make sure the server role 'cockpit_ws' is enabled before enabling the 'Web Console' button.

@miq-bot add_labels compute/infrastructure, compute/cloud

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

@bmclaughlin
Copy link
Contributor Author

@miq-bot add_label bug

@miq-bot miq-bot added the bug label Oct 3, 2017
@bmclaughlin bmclaughlin force-pushed the check-for-active-cockpit-role branch from 325f97c to c735ad2 Compare October 3, 2017 20:29
@h-kataria
Copy link
Contributor

changes look good

@h-kataria h-kataria self-assigned this Oct 5, 2017
@h-kataria
Copy link
Contributor

will merge once Travis errors are fixed.

@bmclaughlin bmclaughlin force-pushed the check-for-active-cockpit-role branch from 835c652 to a48b91d Compare October 5, 2017 20:52
@miq-bot
Copy link
Member

miq-bot commented Oct 5, 2017

Checked commits bmclaughlin/manageiq-ui-classic@a6e0e68~...a48b91d with ruby 2.3.3, rubocop 0.47.1, and haml-lint 0.20.0
6 files checked, 0 offenses detected
Everything looks fine. 🏆

@h-kataria h-kataria added this to the Sprint 71 Ending Oct 16, 2017 milestone Oct 5, 2017
@h-kataria h-kataria merged commit 96b74b9 into ManageIQ:master Oct 5, 2017
@bmclaughlin bmclaughlin deleted the check-for-active-cockpit-role branch October 6, 2017 13:40
@h-kataria h-kataria added fine/yes and removed fine/no labels Nov 7, 2017
@bmclaughlin
Copy link
Contributor Author

simaishi pushed a commit that referenced this pull request Nov 14, 2017
Check for cockpit_ws server role to enable Web Console button
(cherry picked from commit 96b74b9)

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

Fine backport details:

$ git log -1
commit 67a0f0ae8a3fada5746cd72e119bd8bf8f598dab
Author: Harpreet Kataria <[email protected]>
Date:   Thu Oct 5 17:54:22 2017 -0400

    Merge pull request #2285 from bmclaughlin/check-for-active-cockpit-role
    
    Check for cockpit_ws server role to enable Web Console button
    (cherry picked from commit 96b74b933699d78ef008c9ccea6365e16f2b8e99)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1512754

@simaishi
Copy link
Contributor

@bmclaughlin I resolved conflict backporting to Fine, but I deleted an extra character ? from platform_supported? by mistake. Would you mind creating a PR to fix Travis? Sorry!

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