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

Remove confirmation when opening the HTML5 vnc/spice console. #12673

Merged
merged 1 commit into from
Nov 16, 2016

Conversation

martinpovolny
Copy link
Member

Testing: Try clicking on the vnc/spice console. There should be no confirmation.

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

@miq-bot
Copy link
Member

miq-bot commented Nov 16, 2016

Checked commit martinpovolny@0c52cd4 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
2 files checked, 0 offenses detected
Everything looks good. 🏆

@mzazrivec mzazrivec self-assigned this Nov 16, 2016
@mzazrivec mzazrivec added this to the Sprint 50 Ending Dec 5, 2016 milestone Nov 16, 2016
@mzazrivec mzazrivec merged commit ecb6198 into ManageIQ:master Nov 16, 2016
@simaishi
Copy link
Contributor

Euwe backport conflict:

$ git cherry-pick -e -x -m 1 ecb6198
error: could not apply ecb6198... Merge pull request #12673 from martinpovolny/console_remove_confirm
$ 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(

@simaishi
Copy link
Contributor

@martinpovolny Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport.

@simaishi
Copy link
Contributor

Backported to Euwe via #13465

@martinpovolny martinpovolny deleted the console_remove_confirm branch November 28, 2017 18:51
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