filter data on get; optimized #update in ctrl

ZitaNemeckova · Jul 16, 2018 · fd10dfb · fd10dfb
1 parent 8f8824b
commit fd10dfb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/assets/javascripts/components/cloud_subnet/cloud-subnet-form.js b/app/assets/javascripts/components/cloud_subnet/cloud-subnet-form.js
@@ -39,7 +39,7 @@ function cloudSubnetFormController(API, miqService) {
       }).catch(miqService.handleFailure);
     } else {
       API.get("/api/cloud_subnets/" + vm.cloudSubnetFormId + "?expand=resources&attributes=ext_management_system.name,cloud_tenant.name,cloud_network.name").then(function(data) {
-        Object.assign(vm.cloudSubnetModel, data);
+        Object.assign(vm.cloudSubnetModel, _.pick(data, 'name', 'ext_management_system', 'cloud_network', 'cloud_tenant', 'network_protocol', 'cidr', 'dhcp_enabled', 'gateway'));
         vm.afterGet = true;
         vm.modelCopy = angular.copy( vm.cloudSubnetModel );
         miqService.sparkleOff();

diff --git a/app/controllers/cloud_subnet_controller.rb b/app/controllers/cloud_subnet_controller.rb
@@ -149,13 +149,13 @@ def edit
   def update
     assert_privileges("cloud_subnet_edit")
     @subnet = find_record_with_rbac(CloudSubnet, params[:id])
-    options = changed_form_params
     case params[:button]
     when "cancel"
       cancel_action(_("Edit of Subnet \"%{name}\" was cancelled by the user") % {:name  => @subnet.name})
 
     when "save"
       if @subnet.supports_create?
+        options = changed_form_params
         task_id = @subnet.update_cloud_subnet_queue(session[:userid], options)
 
         if task_id.kind_of?(Integer)

diff --git a/spec/javascripts/components/cloud_subnet/cloud_subnet_form_spec.js b/spec/javascripts/components/cloud_subnet/cloud_subnet_form_spec.js
@@ -45,8 +45,7 @@ describe('cloud-subnet-form', function() {
       spyOn(miqService, 'miqAjaxButton');
 
       var cloudSubnetFormResponse = {
-        name: 'abc',
-        gateway_ip: '172.10.1.1'
+        name: 'abc'
       };
 
       spyOn(API, 'get').and.callFake(function() {
@@ -76,13 +75,13 @@ describe('cloud-subnet-form', function() {
     });
 
     it('sets vm.cloudSubnetModel.gateway_ip', function () {
-      expect(vm.cloudSubnetModel.gateway_ip).toBe('172.10.1.1');
+      expect(vm.cloudSubnetModel.gateway_ip).toBe(undefined);
     });
 
     it('updates a Cloud Subnet record', function () {
 
       vm.cloudSubnetModel.name = 'xyz';
-      vm.cloudSubnetModel.gateway_ip = '172.10.1.1';
+      vm.cloudSubnetModel.gateway_ip = '172.10.1.2';
       vm.saveClicked();
 
       expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/cloud_subnet/update/1111?button=save', vm.cloudSubnetModel, { complete: false });