search for: 649001d

...rue, :alert => alert } end + def start + @vm = Vm.find(params[:id]) + render :layout => 'popup' + end + def migrate svc_get_for_migrate(params[:id]) render :layout => 'popup' diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb index 649001d..b8da529 100644 --- a/src/app/models/vm_task.rb +++ b/src/app/models/vm_task.rb @@ -56,7 +56,9 @@ class VmTask < Task :success => Vm::STATE_RUNNING, :failure => Vm::STATE_STOPPED,...

...VmTask::ACTIONS.include?(action) ? true : false + end + # these resource checks are made at VM start/restore time # use pending here by default since this is used for queueing VM # creation/start operations diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb index 762438f..649001d 100644 --- a/src/app/models/vm_task.rb +++ b/src/app/models/vm_task.rb @@ -146,10 +146,10 @@ class VmTask < Task end def self.action_privilege(action) - return ACTIONS[action][:privilege][0] + return ACTIONS[action].nil? ? nil : ACTIONS[action][:privilege][0] end def self.act...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.