Merge lp:~newell-jensen/maas/2.0-fix-1619262 into lp:maas/2.0

[Newell Jensen]

Backport r5451: Reload the subnet when an IP range is deleted.

[Newell Jensen (newell-jensen)]

Self approved backport.

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/subnet_details.js'
--- src/maasserver/static/js/angular/controllers/subnet_details.js	2016-06-16 14:49:55 +0000
+++ src/maasserver/static/js/angular/controllers/subnet_details.js	2016-10-05 20:42:25 +0000
@@ -244,6 +244,8 @@
         $scope.ipRangeConfirmDelete = function() {
             IPRangesManager.deleteItem($scope.deleteIPRange).then(function() {
                 $scope.deleteIPRange = null;
+                // Reload the subnet after deleting the IP range.
+                $scope.subnet = SubnetsManager.getItem($scope.subnet.id);
             });
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-06-16 14:49:55 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-10-05 20:42:25 +0000
@@ -601,12 +601,15 @@
 
         it("calls deleteItem and clears deleteIPRange on resolve", function() {
             var controller = makeController();
+            var subnet = makeSubnet();
             var range = {};
+            $scope.subnet = subnet;
             $scope.deleteIPRange = range;
 
             var defer = $q.defer();
             spyOn(IPRangesManager, "deleteItem").and.returnValue(
                 defer.promise);
+            spyOn(SubnetsManager, "getItem");
             $scope.ipRangeConfirmDelete();
 
             expect(IPRangesManager.deleteItem).toHaveBeenCalledWith(range);
@@ -614,6 +617,7 @@
             $scope.$digest();
 
             expect($scope.deleteIPRange).toBeNull();
+            expect(SubnetsManager.getItem).toHaveBeenCalledWith(subnet.id);
         });
     });
 });