Remove scope, setPristine, use Object.assign, remove miqAjaxButton(ur…

…l, true)
ManageIQ · Jun 26, 2017 · f7b0063 · f7b0063
1 parent 2c1d892
commit f7b0063
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/...assets/javascripts/controllers/vm_cloud/vm_cloud_associate_floating_ip_form_controller.js b/...assets/javascripts/controllers/vm_cloud/vm_cloud_associate_floating_ip_form_controller.js
@@ -22,13 +22,13 @@ ManageIQ.angular.app.controller('vmCloudAssociateFloatingIpFormController', ['$h
   vm.submitClicked = function() {
     miqService.sparkleOn();
     var url = '/vm_cloud/associate_floating_ip_vm/' + vmCloudAssociateFloatingIpFormId + '?button=submit';
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   function getAssociateFloatingIpFormData(response) {
     var data = response.data;
 
-    vm.floating_ips = data.floating_ips;
+    Object.assign(vm, data);
     vm.modelCopy = angular.copy( vm.vmCloudModel );
     miqService.sparkleOff();
   }

diff --git a/app/assets/javascripts/controllers/vm_cloud/vm_cloud_attach_form_controller.js b/app/assets/javascripts/controllers/vm_cloud/vm_cloud_attach_form_controller.js
@@ -6,12 +6,12 @@ ManageIQ.angular.app.controller('vmCloudAttachFormController', ['$scope', 'vmClo
   vm.afterGet = false;
   vm.modelCopy = angular.copy( vm.vmCloudModel );
 
-  ManageIQ.angular.scope = $scope;
+  ManageIQ.angular.scope = vm;
 
   vm.submitClicked = function() {
     miqService.sparkleOn();
     var url = '/vm_cloud/attach_volume/' + vmCloudAttachFormId + '?button=attach';
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   vm.cancelClicked = function() {
@@ -22,7 +22,6 @@ ManageIQ.angular.app.controller('vmCloudAttachFormController', ['$scope', 'vmClo
 
   vm.resetClicked = function() {
     vm.vmCloudModel = angular.copy( vm.modelCopy );
-    vm.angularForm.$setPristine(true);
     miqService.miqFlash("warn", "All changes have been reset");
   };
 }]);
diff --git a/app/assets/javascripts/controllers/vm_cloud/vm_cloud_detach_form_controller.js b/app/assets/javascripts/controllers/vm_cloud/vm_cloud_detach_form_controller.js
@@ -6,12 +6,12 @@ ManageIQ.angular.app.controller('vmCloudDetachFormController', ['$scope', 'vmClo
   vm.afterGet = false;
   vm.modelCopy = angular.copy( vm.vmCloudModel );
 
-  ManageIQ.angular.scope = $scope;
+  ManageIQ.angular.scope = vm;
 
   vm.submitClicked = function() {
     miqService.sparkleOn();
     var url = '/vm_cloud/detach_volume/' + vmCloudDetachFormId + '?button=detach';
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   vm.cancelClicked = function() {
@@ -22,7 +22,6 @@ ManageIQ.angular.app.controller('vmCloudDetachFormController', ['$scope', 'vmClo
 
   vm.resetClicked = function() {
     vm.vmCloudModel = angular.copy(vm.modelCopy);
-    vm.angularForm.$setPristine(true);
     miqService.miqFlash("warn", "All changes have been reset");
   };
 }]);
diff --git a/...ets/javascripts/controllers/vm_cloud/vm_cloud_disassociate_floating_ip_form_controller.js b/...ets/javascripts/controllers/vm_cloud/vm_cloud_disassociate_floating_ip_form_controller.js
@@ -8,7 +8,7 @@ ManageIQ.angular.app.controller('vmCloudDisassociateFloatingIpFormController', [
   vm.formId = vmCloudDisassociateFloatingIpFormId;
   vm.modelCopy = angular.copy( vm.vmCloudModel );
 
-  ManageIQ.angular.scope = $scope;
+  ManageIQ.angular.scope = vm;
 
   $http.get('/vm_cloud/disassociate_floating_ip_form_fields/' + vmCloudDisassociateFloatingIpFormId)
     .then(getDisassociateFloatingIpFormData)
@@ -23,13 +23,12 @@ ManageIQ.angular.app.controller('vmCloudDisassociateFloatingIpFormController', [
   vm.submitClicked = function() {
     miqService.sparkleOn();
     var url = '/vm_cloud/disassociate_floating_ip_vm/' + vmCloudDisassociateFloatingIpFormId + '?button=submit';
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   function getDisassociateFloatingIpFormData(response) {
     var data = response.data;
-
-    vm.floating_ips = data.floating_ips;
+    Object.assign(vm, data);
     vm.modelCopy = angular.copy( vm.vmCloudModel );
     miqService.sparkleOff();
   }

diff --git a/app/assets/javascripts/controllers/vm_cloud/vm_cloud_evacuate_form_controller.js b/app/assets/javascripts/controllers/vm_cloud/vm_cloud_evacuate_form_controller.js
@@ -33,13 +33,12 @@ ManageIQ.angular.app.controller('vmCloudEvacuateFormController', ['$http', '$sco
     if (vmCloudEvacuateFormId) {
       url = '/vm_cloud/evacuate_vm/' + vmCloudEvacuateFormId + '?button=submit';
     }
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   function getEvacuateFormData(response) {
     var data = response.data;
-
-    vm.hosts = data.hosts;
+    Object.assign(vm, data);
     vm.modelCopy = angular.copy(vm.vmCloudModel);
     miqService.sparkleOff();
   }

diff --git a/app/assets/javascripts/controllers/vm_cloud/vm_cloud_live_migrate_form_controller.js b/app/assets/javascripts/controllers/vm_cloud/vm_cloud_live_migrate_form_controller.js
@@ -14,7 +14,7 @@ ManageIQ.angular.app.controller('vmCloudLiveMigrateFormController', ['$http', '$
   vm.formId = vmCloudLiveMigrateFormId;
   vm.modelCopy = angular.copy(vm.vmCloudModel);
 
-  ManageIQ.angular.scope = $scope;
+  ManageIQ.angular.scope = vm;
 
   if (vmCloudLiveMigrateFormId) {
     $http.get('/vm_cloud/live_migrate_form_fields/' + vmCloudLiveMigrateFormId)
@@ -38,14 +38,12 @@ ManageIQ.angular.app.controller('vmCloudLiveMigrateFormController', ['$http', '$
     if (vmCloudLiveMigrateFormId) {
       url = '/vm_cloud/live_migrate_vm/' + vmCloudLiveMigrateFormId + '?button=submit';
     }
-    miqService.miqAjaxButton(url, true);
+    miqService.miqAjaxButton(url, vm.vmCloudModel);
   };
 
   function getLiveMigrateFormData(response) {
     var data = response.data;
-
-    vm.clusters = data.clusters;
-    vm.hosts = data.hosts;
+    Object.assign(vm, data);
     vm.modelCopy = angular.copy(vm.vmCloudModel);
     miqService.sparkleOff();
   }

diff --git a/app/assets/javascripts/controllers/vm_cloud/vm_cloud_resize_form_controller.js b/app/assets/javascripts/controllers/vm_cloud/vm_cloud_resize_form_controller.js
@@ -8,7 +8,9 @@ ManageIQ.angular.app.controller('vmCloudResizeFormController', ['$http', '$scope
     vm.flavors = [];
     vm.formId = vmCloudResizeFormId;
     vm.modelCopy = angular.copy( vm.vmCloudModel );
+
     ManageIQ.angular.scope = vm;
+
     $http.get('/vm_cloud/resize_form_fields/' + vmCloudResizeFormId)
       .then(getResizeFormData)
       .catch(miqService.handleFailure);
@@ -28,7 +30,7 @@ ManageIQ.angular.app.controller('vmCloudResizeFormController', ['$http', '$scope
 
   function getResizeFormData(response) {
     var data = response.data;
-    vm.flavors = data.flavors;
+    Object.assign(vm, data);
     miqService.sparkleOff();
   };