MAAS

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

  1. fix-comm-options
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 5176
Proposed branch: lp:~blake-rouse/maas/fix-comm-options
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 58 lines (+14/-18)
1 file modified
src/maasserver/static/partials/nodes-list.html (+14/-18)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-comm-options
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+300104@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
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html 2016-06-14 20:52:22 +0000
+++ src/maasserver/static/partials/nodes-list.html 2016-07-14 16:28:59 +0000
@@ -51,40 +51,36 @@
51 <div class="page-header__dropdown ng-hide" data-ng-show="tabs.nodes.actionOption">51 <div class="page-header__dropdown ng-hide" data-ng-show="tabs.nodes.actionOption">
52 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->52 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
53 <div class="page-header__feedback ng-hide" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">53 <div class="page-header__feedback ng-hide" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">
54 <form class="form-inline">54 <form class="form form--inline">
55 <div class="eight-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">55 <div class="nine-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
56 <div class="inline width--auto margin-top--ten margin-right left">56 <div class="form__group u-margin--right u-margin--top-tiny">
57 <input class="checkbox margin-right" id="enableSSH" type="checkbox"57 <input class="checkbox margin-right" id="enableSSH" type="checkbox"
58 data-ng-model="tabs.nodes.commissionOptions.enableSSH">58 data-ng-model="tabs.nodes.commissionOptions.enableSSH">
59 <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>59 <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>
60 </div>60 </div>
61 <div class="inline width--auto margin-top--ten margin-right left">61 <div class="form__group u-margin--right u-margin--top-tiny">
62 <input class="checkbox margin-right" id="skipNetworking" type="checkbox"62 <input class="checkbox margin-right" id="skipNetworking" type="checkbox"
63 data-ng-model="tabs.nodes.commissionOptions.skipNetworking">63 data-ng-model="tabs.nodes.commissionOptions.skipNetworking">
64 <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>64 <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>
65 </div>65 </div>
66 <div class="inline width--auto margin-top--ten margin-right left">66 <div class="form__group u-margin--top-tiny">
67 <input class="checkbox" id="skipStorage" type="checkbox"67 <input class="checkbox" id="skipStorage" type="checkbox"
68 data-ng-model="tabs.nodes.commissionOptions.skipStorage">68 data-ng-model="tabs.nodes.commissionOptions.skipStorage">
69 <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>69 <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>
70 </div>70 </div>
71 </div>71 </div>
72 <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">72 <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
73 <label for="image">Choose your image</label>73 <label for="image" class="u-margin--right">Choose your image</label>
74 <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>74 <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>
75 </span>75 </span>
76 <!-- XXX rbanffy 2015-03-23 - Need to add e2e test. -->76 <!-- XXX rbanffy 2015-03-23 - Need to add e2e test. -->
77 <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">77 <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
78 <span class="five-col no-margin-bottom">78 <label for="zone" class="u-margin--right">Select Zone</label>
79 <span class="inline">79 <select name="zone" id="zone" placeholder="Choose a zone"
80 <label for="zone">Select Zone</label>80 data-ng-model="tabs.nodes.zoneSelection"
81 <select name="zone" id="zone" class="three-col" placeholder="Choose a zone"81 data-ng-options="zone as zone.name for zone in zones">
82 data-ng-model="tabs.nodes.zoneSelection"82 <option value="" disabled="disabled">Choose a zone</option>
83 data-ng-options="zone as zone.name for zone in zones">83 </select>
84 <option value="" disabled="disabled">Choose a zone</option>
85 </select>
86 </span>
87 </span>
88 </span>84 </span>
89 <div class="right">85 <div class="right">
90 <a href="" class="link-cta-ubuntu text-button" data-ng-click="actionCancel('nodes')">Cancel</a>86 <a href="" class="link-cta-ubuntu text-button" data-ng-click="actionCancel('nodes')">Cancel</a>