Merge ~ltrager/maas:lp1763831 into maas:master

[Lee Trager]

LP: #1763831 - Only show available actions

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1763831 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 56a2d0893953e4c13c741b2e7c20df1d1030b70d

review: Approve

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index 5adb5cb..3e59b5b 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -161,8 +161,9 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 // allowed actions, except set-zone which does not make
                 // sense in this view because the form has this
                 // functionality
-                $scope.action.availableOptions = GeneralManager.getData(
+                $scope.action.allOptions = GeneralManager.getData(
                     actionTypeForNodeType[$scope.node.node_type]);
+                $scope.action.availableOptions.length = 0;
                 angular.forEach($scope.action.allOptions, function(option) {
                     if($scope.node.actions.indexOf(option.name) >= 0
                        && option.name !== "set-zone") {
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
index 1613463..9b89802 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
@@ -606,6 +606,33 @@ describe("NodeDetailsController", function() {
         ]);
     });
 
+    it("updates $scope.actions", function() {
+        var setActiveDefer = $q.defer();
+        spyOn(MachinesManager, "setActiveItem").and.returnValue(
+            setActiveDefer.promise);
+        var loadManagersDefer = $q.defer();
+        var loadItemsDefer = $q.defer();
+        var controller = makeController(loadManagersDefer, loadItemsDefer);
+        node.node_type = 0;
+        node.actions = ['test', 'release', 'delete'];
+        var all_actions = [
+            {'name': 'deploy'},
+            {'name': 'commission'},
+            {'name': 'test'},
+            {'name': 'release'},
+            {'name': 'delete'}
+        ];
+        loadManagersDefer.resolve();
+        $rootScope.$digest();
+        setActiveDefer.resolve(node);
+        $rootScope.$digest();
+        loadItemsDefer.resolve(all_actions);
+        $rootScope.$digest();
+        expect($scope.action.allOptions).toEqual(all_actions);
+        expect($scope.action.availableOptions).toEqual([
+            {'name': 'test'}, {'name': 'release'}, {'name': 'delete'}]);
+    });
+
     it("reloads osinfo on route change", function() {
         var controller = makeController();
         $scope.$emit("$routeChangeSuccess");