Merge lp:~blake-rouse/maas/fix-comm-options-2.0 into lp:maas/2.0

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: 5161
Merged at revision: 5160
Proposed branch: lp:~blake-rouse/maas/fix-comm-options-2.0
Merge into: lp:maas/2.0
Diff against target: 71 lines (+16/-18)
2 files modified
docs/changelog.rst (+2/-0)
src/maasserver/static/partials/nodes-list.html (+14/-18)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-comm-options-2.0
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+300142@code.launchpad.net

Commit message

Fix commissioning options on the node listing page to not be grayed out.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Backport self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/changelog.rst'
2--- docs/changelog.rst 2016-07-13 22:03:17 +0000
3+++ docs/changelog.rst 2016-07-14 23:50:55 +0000
4@@ -13,6 +13,8 @@
5
6 LP: #1594991 MAAS displays every power query on the summarized view of node event log.
7
8+LP: #1603147 Commissioning dropdown is grey and checkmarks are missing.
9+
10
11 2.0.0 (rc2)
12 ===========
13
14=== modified file 'src/maasserver/static/partials/nodes-list.html'
15--- src/maasserver/static/partials/nodes-list.html 2016-06-14 20:52:22 +0000
16+++ src/maasserver/static/partials/nodes-list.html 2016-07-14 23:50:55 +0000
17@@ -51,40 +51,36 @@
18 <div class="page-header__dropdown ng-hide" data-ng-show="tabs.nodes.actionOption">
19 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
20 <div class="page-header__feedback ng-hide" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">
21- <form class="form-inline">
22- <div class="eight-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
23- <div class="inline width--auto margin-top--ten margin-right left">
24+ <form class="form form--inline">
25+ <div class="nine-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
26+ <div class="form__group u-margin--right u-margin--top-tiny">
27 <input class="checkbox margin-right" id="enableSSH" type="checkbox"
28 data-ng-model="tabs.nodes.commissionOptions.enableSSH">
29 <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>
30 </div>
31- <div class="inline width--auto margin-top--ten margin-right left">
32+ <div class="form__group u-margin--right u-margin--top-tiny">
33 <input class="checkbox margin-right" id="skipNetworking" type="checkbox"
34 data-ng-model="tabs.nodes.commissionOptions.skipNetworking">
35 <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>
36 </div>
37- <div class="inline width--auto margin-top--ten margin-right left">
38+ <div class="form__group u-margin--top-tiny">
39 <input class="checkbox" id="skipStorage" type="checkbox"
40 data-ng-model="tabs.nodes.commissionOptions.skipStorage">
41 <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>
42 </div>
43 </div>
44- <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
45- <label for="image">Choose your image</label>
46+ <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
47+ <label for="image" class="u-margin--right">Choose your image</label>
48 <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>
49 </span>
50 <!-- XXX rbanffy 2015-03-23 - Need to add e2e test. -->
51- <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
52- <span class="five-col no-margin-bottom">
53- <span class="inline">
54- <label for="zone">Select Zone</label>
55- <select name="zone" id="zone" class="three-col" placeholder="Choose a zone"
56- data-ng-model="tabs.nodes.zoneSelection"
57- data-ng-options="zone as zone.name for zone in zones">
58- <option value="" disabled="disabled">Choose a zone</option>
59- </select>
60- </span>
61- </span>
62+ <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
63+ <label for="zone" class="u-margin--right">Select Zone</label>
64+ <select name="zone" id="zone" placeholder="Choose a zone"
65+ data-ng-model="tabs.nodes.zoneSelection"
66+ data-ng-options="zone as zone.name for zone in zones">
67+ <option value="" disabled="disabled">Choose a zone</option>
68+ </select>
69 </span>
70 <div class="right">
71 <a href="" class="link-cta-ubuntu text-button" data-ng-click="actionCancel('nodes')">Cancel</a>

Subscribers

People subscribed via source and target branches

to all changes: