Merge lp:~andreserl/maas/lp1660185 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Only shows the release title for a machine that's 'Deployed'.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/nodes_list.js'
--- src/maasserver/static/js/angular/controllers/nodes_list.js	2016-10-07 18:48:30 +0000
+++ src/maasserver/static/js/angular/controllers/nodes_list.js	2017-03-02 04:56:36 +0000
@@ -619,7 +619,12 @@
                 if(node.osystem === "ubuntu") {
                     releaseTitle = releaseTitle.split('"')[0].trim();
                 }
-                return node.status + ' ' + releaseTitle;
+                if(node.status === "Deployed") {
+                    return releaseTitle;
+                }
+                if(node.status === "Deploying") {
+                    return node.status + ' ' + releaseTitle;
+                }
             }
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js'
--- src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js	2016-10-07 18:48:30 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js	2017-03-02 04:56:36 +0000
@@ -200,7 +200,7 @@
                 'Deploying Ubuntu Xenial');
         });
 
-        it("returns status with release title when deployed", function() {
+        it("returns release title when deployed", function() {
             var controller = makeController();
             var node = {
                 status: "Deployed",
@@ -213,10 +213,10 @@
                 ]
             };
             expect($scope.getStatusText(node)).toBe(
-                'Deployed Ubuntu Xenial');
+                'Ubuntu Xenial');
         });
 
-        it("returns status with release title without codename", function() {
+        it("returns release title without codename when deployed", function() {
             var controller = makeController();
             var node = {
                 status: "Deployed",
@@ -229,7 +229,7 @@
                 ]
             };
             expect($scope.getStatusText(node)).toBe(
-                'Deployed Ubuntu 16.04 LTS');
+                'Ubuntu 16.04 LTS');
         });
     });