[cloudstack] branch 4.11 updated: ui: show reset SSH key for VM in running state (#2778)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new a32bd46  ui: show reset SSH key for VM in running state (#2778)
a32bd46 is described below

commit a32bd464b6b4bb39b0330def2904964bd9d64a7b
Author: ernjvr <er...@gmail.com>
AuthorDate: Tue Jul 31 09:33:50 2018 +0200

    ui: show reset SSH key for VM in running state (#2778)
    
    In the UI, on the Instances screen, the Quickview popup window and the Details window do not display the 'Reset SSH Key Pair' button for VMs in a running state. They only display when the VM is in a stopped state. This is inconsistent with the 'Reset Password' button behaviour, where it displays in both VM states: running and stopped. This fixes the issue so that the 'Reset SSH Key Pair' button also displays in both VM states.
    
    Expected Behaviour:
    In the UI, on the Instances screen, the Quickview popup window and the Details window must display the 'Reset SSH Key Pair' button in both VM states: running and stopped. When a user clicks on the 'Reset SSH Key Pair' button and a VM is in a running state, it will display a message "Vm xxx should be stopped to do SSH Key reset".
    Actual Behaviour:
    In the UI, on the Instances screen, the Quickview popup window and the Details window do not display the 'Reset SSH Key Pair' button for VMs in a running state. It only displays when the VM is in a stopped state.
---
 ui/scripts/instances.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 84d6003..4e89cdb 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -3243,6 +3243,7 @@
             }
 
             allowedActions.push("viewConsole");
+            allowedActions.push("resetSSHKeyForVirtualMachine");
         } else if (jsonObj.state == 'Stopped') {
             allowedActions.push("edit");
             if (isAdmin())