-
Notifications
You must be signed in to change notification settings - Fork 898
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
Remove confirmation when opening the HTML5 vnc/spice console. #12673
Merged
mzazrivec
merged 1 commit into
ManageIQ:master
from
martinpovolny:console_remove_confirm
Nov 16, 2016
Merged
Remove confirmation when opening the HTML5 vnc/spice console. #12673
mzazrivec
merged 1 commit into
ManageIQ:master
from
martinpovolny:console_remove_confirm
Nov 16, 2016
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
Checked commit martinpovolny@0c52cd4 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 |
Euwe backport conflict:
$ git diff
diff --cc app/helpers/application_helper/toolbar/x_vm_center.rb
index e3bf0c6,7c9e8bc..0000000
--- a/app/helpers/application_helper/toolbar/x_vm_center.rb
+++ b/app/helpers/application_helper/toolbar/x_vm_center.rb
@@@ -228,43 -228,33 +228,73 @@@ class ApplicationHelper::Toolbar::XVmCe
:options => {:feature => :reset}),
]
),
++<<<<<<< HEAD
+ ])
+ button_group('vm_access', [
+ select(
+ :vm_remote_access_choice,
+ 'fa pficon-screen fa-lg',
+ N_('VM Remote Access'),
+ N_('Access'),
+ :items => [
+ button(
+ :vm_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a web-based console for this VM'),
+ N_('VM Console'),
+ :url => "console",
+ :confirm => N_("Opening a VM web-based console can take a while and requires that the VMware MKS plugin version configured for Management Engine already be installed and working. Are you sure?")),
+ button(
+ :vm_vnc_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a web-based VNC or SPICE console for this VM'),
+ N_('VM Console'),
+ :url => "html5_console"),
+ button(
+ :vm_vmrc_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a web-based VMRC console for this VM. This requires that VMRC is pre-configured to work in your browser.'),
+ N_('VM Console'),
+ :url => "vmrc_console",
+ :confirm => N_("Opening a VM web-based VMRC console requires that VMRC is pre-configured to work in your browser. Are you sure?")),
+ button(
+ :cockpit_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a new browser window with Cockpit for this VM. This requires that Cockpit is pre-configured on the VM.'),
+ N_('Web Console'),
+ # :image => "cockpit",
+ :url => "launch_cockpit"),
+ ]
+ ),
++=======
+ button(
+ :vm_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a web-based console for this VM'),
+ nil,
+ :url => "console",
+ :confirm => N_("Opening a VM web-based console can take a while and requires that the VMware MKS plugin version configured for Management Engine already be installed and working. Are you sure?")),
+ button(
+ :vm_vnc_console,
+ 'fa fa-html5 fa-lg',
+ N_('Open a web-based VNC or SPICE console for this VM'),
+ nil,
+ :url => "html5_console"),
+ button(
+ :vm_vmrc_console,
+ 'pficon pficon-screen fa-lg',
+ N_('Open a web-based VMRC console for this VM. This requires that VMRC is pre-configured to work in your browser.'),
+ nil,
+ :url => "vmrc_console",
+ :confirm => N_("Opening a VM web-based VMRC console requires that VMRC is pre-configured to work in your browser. Are you sure?")),
+ button(
+ :cockpit_console,
+ nil,
+ N_('Open a new browser window with Cockpit for this VM. This requires that Cockpit is pre-configured on the VM.'),
+ nil,
+ :image => "cockpit",
+ :url => "launch_cockpit"),
++>>>>>>> ecb6198... Merge pull request #12673 from martinpovolny/console_remove_confirm
])
button_group('snapshot_tasks', [
button(
|
@martinpovolny Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport. |
Backported to Euwe via #13465 |
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.
Testing: Try clicking on the vnc/spice console. There should be no confirmation.
https://bugzilla.redhat.com/show_bug.cgi?id=1348721