MAAS

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

  1. hide-retired-reserved-bug-979902
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 477
Proposed branch: lp:~allenap/maas/hide-retired-reserved-bug-979902
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 38 lines (+12/-0)
2 files modified
src/maasserver/static/js/node_views.js (+6/-0)
src/maasserver/static/js/tests/test_node_views.js (+6/-0)
To merge this branch: bzr merge lp:~allenap/maas/hide-retired-reserved-bug-979902
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+102324@code.launchpad.net

Commit message

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

Description of the change

Pre-imp with rvba.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good.

[0]

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

review: Approve
Revision history for this message
Gavin Panella (allenap) wrote :

> 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/js/node_views.js'
2--- src/maasserver/static/js/node_views.js 2012-03-21 15:29:00 +0000
3+++ src/maasserver/static/js/node_views.js 2012-04-17 16:33:30 +0000
4@@ -145,7 +145,13 @@
5 this.numberNode = Y.one(config.numberNode);
6 this.descriptionNode = Y.one(config.descriptionNode);
7 this.reservedNode = Y.one(config.reservedNode);
8+ /* XXX: GavinPanella 2012-04-17 bug=984117:
9+ * Hidden until we support reserved nodes. */
10+ this.reservedNode.hide();
11 this.retiredNode = Y.one(config.retiredNode);
12+ /* XXX: GavinPanella 2012-04-17 bug=984116:
13+ * Hidden until we support retired nodes. */
14+ this.retiredNode.hide();
15 this.deployed_nodes = 0;
16 this.commissioned_nodes = 0;
17 this.queued_nodes = 0;
18
19=== modified file 'src/maasserver/static/js/tests/test_node_views.js'
20--- src/maasserver/static/js/tests/test_node_views.js 2012-03-23 13:46:13 +0000
21+++ src/maasserver/static/js/tests/test_node_views.js 2012-04-17 16:33:30 +0000
22@@ -160,10 +160,16 @@
23 '3 nodes reserved for named deployment.',
24 Y.one('#reserved-nodes').get('text'),
25 'The reserved text should be set');
26+ /* XXX: GavinPanella 2012-04-17 bug=984117:
27+ * Hidden until we support reserved nodes. */
28+ Y.Assert.areEqual("none", view.reservedNode.getStyle("display"));
29 Y.Assert.areEqual(
30 '1 retired node not represented.',
31 Y.one('#retired-nodes').get('text'),
32 'The retired text should be set');
33+ /* XXX: GavinPanella 2012-04-17 bug=984116:
34+ * Hidden until we support retired nodes. */
35+ Y.Assert.areEqual("none", view.retiredNode.getStyle("display"));
36 },
37
38 testUpdateNodeCreation: function() {