Merge lp:~allenap/maas/hide-retired-reserved-bug-979902 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Hide the reserved and retired nodes messages from the front-page chart view.

Pre-imp with rvba.

[Raphaël Badin (rvb)]

Looks good.

[0]

Maybe you could file 2 small bugs ("Add feature to retire/reserve node") and reference them in the code.

review: Approve

[Gavin Panella (allenap)]

> Maybe you could file 2 small bugs ("Add feature to retire/reserve
> node") and reference them in the code.

Good idea. I've filed bug 984116 and bug 984117 and referenced them in
the code.

=== modified file 'src/maasserver/static/js/node_views.js'
--- src/maasserver/static/js/node_views.js	2012-03-21 15:29:00 +0000
+++ src/maasserver/static/js/node_views.js	2012-04-17 16:33:30 +0000
@@ -145,7 +145,13 @@
         this.numberNode = Y.one(config.numberNode);
         this.descriptionNode = Y.one(config.descriptionNode);
         this.reservedNode = Y.one(config.reservedNode);
+        /* XXX: GavinPanella 2012-04-17 bug=984117:
+         * Hidden until we support reserved nodes. */
+        this.reservedNode.hide();
         this.retiredNode = Y.one(config.retiredNode);
+        /* XXX: GavinPanella 2012-04-17 bug=984116:
+         * Hidden until we support retired nodes. */
+        this.retiredNode.hide();
         this.deployed_nodes = 0;
         this.commissioned_nodes = 0;
         this.queued_nodes = 0;
 
=== modified file 'src/maasserver/static/js/tests/test_node_views.js'
--- src/maasserver/static/js/tests/test_node_views.js	2012-03-23 13:46:13 +0000
+++ src/maasserver/static/js/tests/test_node_views.js	2012-04-17 16:33:30 +0000
@@ -160,10 +160,16 @@
             '3 nodes reserved for named deployment.',
             Y.one('#reserved-nodes').get('text'),
             'The reserved text should be set');
+        /* XXX: GavinPanella 2012-04-17 bug=984117:
+         * Hidden until we support reserved nodes. */
+        Y.Assert.areEqual("none", view.reservedNode.getStyle("display"));
         Y.Assert.areEqual(
             '1 retired node not represented.',
             Y.one('#retired-nodes').get('text'),
             'The retired text should be set');
+        /* XXX: GavinPanella 2012-04-17 bug=984116:
+         * Hidden until we support retired nodes. */
+        Y.Assert.areEqual("none", view.retiredNode.getStyle("display"));
     },
 
     testUpdateNodeCreation: function() {