Merge pull request #860 from AparnaKarve/q_all_promises

$q all promises and resolve them in the end
ManageIQ · Apr 12, 2017 · 73f263d · 73f263d
2 parents 079f752 + 56da8bc
commit 73f263d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js b/...assets/javascripts/controllers/ansible_credentials/ansible_credentials_form_controller.js
@@ -1,6 +1,6 @@
 /* global miqFlashLater */
 
-ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window', 'credentialId', 'miqService', 'API', function($window, credentialId,  miqService, API) {
+ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window', '$q', 'credentialId', 'miqService', 'API', function($window, $q, credentialId,  miqService, API) {
   var vm = this;
 
   var init = function() {
@@ -22,12 +22,12 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
     miqService.sparkleOn();
 
     // get credential specific options for all supported credential types
-    API.options('/api/authentications')
+    var optionsPromise = API.options('/api/authentications')
       .then(getCredentialOptions)
       .catch(miqService.handleFailure);
 
     if (credentialId !== 'new') {
-      API.get('/api/authentications/' + credentialId)
+      var dataPromise = API.get('/api/authentications/' + credentialId)
         .then(getCredentialFormData)
         .catch(miqService.handleFailure);
     } else {
@@ -40,6 +40,9 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
       vm.modelCopy = angular.copy( vm.credentialModel );
       miqService.sparkleOff();
     }
+
+    $q.all([optionsPromise, dataPromise])
+      .then(retrievedCredentialDetails);
   };
 
   vm.cancelClicked = function(angularForm) {
@@ -68,13 +71,17 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
        .catch(miqService.handleFailure);
   };
 
+  function retrievedCredentialDetails() {
+    vm.afterGet = true;
+    miqService.sparkleOff();
+  }
+
   function getCredentialOptions(response) {
     Object.assign(vm.credential_options, response.data.credential_types.embedded_ansible_credential_types);
 
     for (var opt in vm.credential_options) {
       vm.select_options.push({'value': opt, 'label': vm.credential_options[opt].label});
     }
-    vm.afterGet = true;
   }
 
   function getCredentialFormData(response) {
@@ -95,8 +102,6 @@ ManageIQ.angular.app.controller('ansibleCredentialsFormController', ['$window',
     }
 
     vm.modelCopy = angular.copy( vm.credentialModel );
-    vm.afterGet = true;
-    miqService.sparkleOff();
   }
 
   function getBack(message, warning, error) {