Merge ~ltrager/maas:lp1710681_2.2 into maas:2.2

[Lee Trager]

LP: #1710681 - Allow architecture to be deselected in the UI.

The UI was preventing architectures from being deselected because removing the architecture meant removing the commissioning series for that architecture. The user is now allowed to deselect an architecture as long as another architecture is selected.

This is a backport of 79247ae722b4abe84154a1305b9be69e6158b490

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/329079

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/boot_images.js b/src/maasserver/static/js/angular/directives/boot_images.js
index c23948b..9de6632 100644
--- a/src/maasserver/static/js/angular/directives/boot_images.js
+++ b/src/maasserver/static/js/angular/directives/boot_images.js
@@ -672,15 +672,25 @@ angular.module('MAAS').directive('maasBootImages', [
                 // Return true if can save the current selection.
                 $scope.canSaveSelection = function() {
                     var commissioning_series_being_deleted = false;
+                    var commissioning_series_arches = 0;
                     var i;
+                    for(i = 0; i < $scope.ubuntuImages.length; i++) {
+                        if($scope.ubuntuImages[i].name ===
+                           $scope.bootResources.ubuntu.commissioning_series) {
+                            commissioning_series_arches++;
+                        }
+                    }
                     // Only prevent the current commissioning series from
-                    // being deleted. If the current commissioning series isn't
-                    // currently selected another LTS may be choosen,
-                    // downloaded, and configured as the commissioning series.
+                    // being deleted if it isn't the commissioning series isn't
+                    // available on another architecture.. If the current
+                    // commissioning series isn't currently selected another
+                    // LTS may be choosen, downloaded, and configured as the
+                    // commissioning series.
                     for(i = 0; i < $scope.ubuntuImages.length; i++) {
                         if($scope.ubuntuImages[i].beingDeleted &&
                            $scope.ubuntuImages[i].name ===
-                           $scope.bootResources.ubuntu.commissioning_series) {
+                           $scope.bootResources.ubuntu.commissioning_series &&
+                           commissioning_series_arches === 1) {
                             commissioning_series_being_deleted = true;
                             break;
                         }
diff --git a/src/maasserver/static/js/angular/directives/tests/test_boot_images.js b/src/maasserver/static/js/angular/directives/tests/test_boot_images.js
index 01b1b51..024cc23 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_boot_images.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_boot_images.js
@@ -1545,6 +1545,29 @@ describe("maasBootImages", function() {
             expect(scope.canSaveSelection()).toBe(false);
         });
 
+        it("returns true if deleting one commissioning series", function() {
+            var directive = compileDirective();
+            var scope = directive.isolateScope();
+            scope.saving = false;
+            spyOn(scope, "ltsIsSelected").and.returnValue(true);
+            scope.bootResources.ubuntu = {
+                commissioning_series: makeName("series")
+            };
+            scope.ubuntuImages = [
+                {
+                    beingDeleted: true,
+                    name: scope.bootResources.ubuntu.commissioning_series,
+                    arch: makeName("arch")
+                },
+                {
+                    beingDeleted: false,
+                    name: scope.bootResources.ubuntu.commissioning_series,
+                    arch: makeName("arch")
+                }
+            ];
+            expect(scope.canSaveSelection()).toBe(true);
+        });
+
         it("returns false if saving", function() {
             var directive = compileDirective();
             var scope = directive.isolateScope();