← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/maas/hide-retired-reserved-bug-979902 into lp:maas

 

Gavin Panella has proposed merging lp:~allenap/maas/hide-retired-reserved-bug-979902 into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #979902 in MAAS: "Retired and reserved nodes should not be on the dashboard"
  https://bugs.launchpad.net/maas/+bug/979902

For more details, see:
https://code.launchpad.net/~allenap/maas/hide-retired-reserved-bug-979902/+merge/102324

Pre-imp with rvba.
-- 
https://code.launchpad.net/~allenap/maas/hide-retired-reserved-bug-979902/+merge/102324
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/hide-retired-reserved-bug-979902 into lp:maas.
=== 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 14:48:19 +0000
@@ -145,7 +145,9 @@
         this.numberNode = Y.one(config.numberNode);
         this.descriptionNode = Y.one(config.descriptionNode);
         this.reservedNode = Y.one(config.reservedNode);
+        this.reservedNode.hide();  // Until we support it.
         this.retiredNode = Y.one(config.retiredNode);
+        this.retiredNode.hide();  // Until we support it.
         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 14:48:19 +0000
@@ -160,10 +160,14 @@
             '3 nodes reserved for named deployment.',
             Y.one('#reserved-nodes').get('text'),
             'The reserved text should be set');
+        // However, the reserved nodes message should be hidden for now.
+        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');
+        // However, the retired nodes message should be hidden for now.
+        Y.Assert.areEqual("none", view.retiredNode.getStyle("display"));
     },
 
     testUpdateNodeCreation: function() {