diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index 9dc865b307..011854fde9 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -170,8 +170,7 @@ module OpenNebulaJSON end def recover(params=Hash.new) - result = params['with'] == "success" ? true : false - super(result) + super(params['result'].to_i) end end end diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 5a277d7957..f8e90aa2e1 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -1164,7 +1164,7 @@ var OpenNebula = { OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"unresched"); }, "recover" : function(params){ - var action_obj = {"with": params.data.extra_param}; + var action_obj = {"result": params.data.extra_param}; OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"recover",action_obj); }, "accounting": function(params){ diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index f2da9f7409..2cfb7362d2 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1066,12 +1066,15 @@ var vm_buttons = { type: "confirm_with_select", text: tr("Recover"), layout: "vmsplanification_buttons", - custom_select: '', + custom_select: '', tip: tr("Recovers a stuck VM that is waiting for a driver operation. \ - The recovery may be done by failing or succeeding the pending operation. \ + The recovery may be done by failing, succeeding or retrying the current operation. \ YOU NEED TO MANUALLY CHECK THE VM STATUS ON THE HOST, to decide if the operation \ - was successful or not."), + was successful or not, or if it can be retried."), custom_classes : "state-dependent" }, "VM.startvnc" : {