Merge pull request #1558 from himdel/keypair-sparkle-fine

[FINE] Key Pair (angular) - don't sparkleOff when waiting for task
ManageIQ · Jun 19, 2017 · a8a122c · a8a122c
2 parents d7394c9 + 534a27e
commit a8a122c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/assets/javascripts/controllers/auth_key_pair_cloud/auth_key_pair_cloud_controller.js b/app/assets/javascripts/controllers/auth_key_pair_cloud/auth_key_pair_cloud_controller.js
@@ -29,12 +29,11 @@ ManageIQ.angular.app.controller('keyPairCloudFormController', ['$http', '$scope'
 
         var url = '/auth_key_pair_cloud/create/' + keyPairFormId + '?button=' + buttonName;
         $scope.keyPairModel.ems_id = $scope.keyPairModel.ems.id;
-        if(serializeFields) {
-            miqService.miqAjaxButton(url, miqService.serializeModel($scope.keyPairModel));
+        if (serializeFields) {
+            miqService.miqAjaxButton(url, miqService.serializeModel($scope.keyPairModel), { complete: false });
         } else {
-            miqService.miqAjaxButton(url, false);
+            miqService.miqAjaxButton(url);
         }
-        miqService.sparkleOff();
     };
 
     $scope.cancelClicked = function() {
@@ -69,4 +68,4 @@ ManageIQ.angular.app.controller('keyPairCloudFormController', ['$http', '$scope'
     }
 
     init();
-}]);
+}]);
diff --git a/spec/javascripts/controllers/auth_key_pair_cloud/auth_key_pair_cloud_controller_spec.js b/spec/javascripts/controllers/auth_key_pair_cloud/auth_key_pair_cloud_controller_spec.js
@@ -69,15 +69,15 @@ describe('keyPairCloudFormController', function() {
         });
 
         it('delegates to miqService.miqAjaxButton', function() {
-            expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/auth_key_pair_cloud/create/new?button=save', miqService.serializeModel($scope.keyPairModel));
+            expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/auth_key_pair_cloud/create/new?button=save', miqService.serializeModel($scope.keyPairModel), { complete: false });
         });
     });
 
     describe('#cancelClicked', function() {
         beforeEach(function() {
             $httpBackend.flush();
             $scope.angularForm = {
-                $setPristine: function (value){}
+                $setPristine: function (value) {},
             };
             $scope.cancelClicked();
         });
@@ -87,7 +87,7 @@ describe('keyPairCloudFormController', function() {
         });
 
         it('delegates to miqService.restAjaxButton', function() {
-            expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/auth_key_pair_cloud/create/new?button=cancel', false);
+            expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/auth_key_pair_cloud/create/new?button=cancel');
         });
     });
 });