Merge pull request #6466 from mzazrivec/correctly_handle_machine_cred…

…ential_resource_without_options Machine Credential: don't access options hash when null
ManageIQ · Dec 2, 2019 · 9c5532f · 9c5532f
2 parents f3a9edb + 7e490b5
commit 9c5532f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js b/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js
@@ -118,7 +118,7 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
         } else {
           vm.credentialModel[key] = '';
 
-          if (response.options[key]) {
+          if (response.options && response.options[key]) {
             vm.credentialModel[key] = response.options[key];
           } else if (response[key]) {
             vm.credentialModel[key] = response[key];