Merge pull request #3456 from sseago/evacuate_controller_fix

BZ1544764: Fix evacuate host param handling in controller
ManageIQ · Feb 23, 2018 · 15b7033 · 15b7033
2 parents 9e9ba41 + 8ac6c1d
commit 15b7033
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/controllers/mixins/actions/vm_actions/evacuate.rb b/app/controllers/mixins/actions/vm_actions/evacuate.rb
@@ -76,9 +76,9 @@ def evacuate_handle_submit_button
           @evacuate_items.each do |vm|
             if vm.supports_evacuate?
               options = {
-                :hostname          => params['auto_select_host']  == 'on' ? nil : params['destination_host'],
-                :on_shared_storage => params['on_shared_storage'] == 'on',
-                :admin_password    => params['on_shared_storage'] == 'on' ? nil : params['admin_password']
+                :hostname          => params['auto_select_host']  == 'true' ? nil : params['destination_host'],
+                :on_shared_storage => params['on_shared_storage'] == 'true',
+                :admin_password    => params['on_shared_storage'] == 'true' ? nil : params['admin_password']
               }
               task_id = vm.class.evacuate_queue(session[:userid], vm, options)
               add_flash(_("Instance evacuation task failed."), :error) unless task_id.kind_of?(Integer)