MAAS

Merge lp:~andreserl/maas/lp1661581 into lp:~maas-committers/maas/trunk

  1. lp1661581
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5893
Proposed branch: lp:~andreserl/maas/lp1661581
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 66 lines (+6/-6)
3 files modified
src/maasserver/static/js/angular/controllers/dashboard.js (+1/-1)
src/maasserver/static/js/angular/controllers/tests/test_dashboard.js (+3/-3)
src/maasserver/static/partials/dashboard.html (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/lp1661581
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+321401@code.launchpad.net

Commit message

Demote 'Parent' field under 'IP assignment', and reorder options to list 'Static' first.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

LGTM assuming you tested manually.

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Yup! I did

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/js/angular/controllers/dashboard.js'
2--- src/maasserver/static/js/angular/controllers/dashboard.js 2017-02-17 14:23:04 +0000
3+++ src/maasserver/static/js/angular/controllers/dashboard.js 2017-03-30 03:46:51 +0000
4@@ -16,8 +16,8 @@
5
6 // Default device IP options.
7 var deviceIPOptions = [
8+ ['static', 'Static'],
9 ['dynamic', 'Dynamic'],
10- ['static', 'Static'],
11 ['external', 'External']
12 ];
13
14
15=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_dashboard.js'
16--- src/maasserver/static/js/angular/controllers/tests/test_dashboard.js 2016-11-17 11:46:08 +0000
17+++ src/maasserver/static/js/angular/controllers/tests/test_dashboard.js 2017-03-30 03:46:51 +0000
18@@ -211,8 +211,8 @@
19 goTo: false,
20 saved: false,
21 deviceIPOptions: [
22+ ['static', 'Static'],
23 ['dynamic', 'Dynamic'],
24- ['static', 'Static'],
25 ['external', 'External']
26 ]
27 });
28@@ -278,8 +278,8 @@
29 goTo: false,
30 saved: false,
31 deviceIPOptions: [
32+ ['static', 'Static'],
33 ['dynamic', 'Dynamic'],
34- ['static', 'Static'],
35 ['external', 'External']
36 ],
37 primary_mac: discovered.mac_address,
38@@ -321,8 +321,8 @@
39 goTo: false,
40 saved: false,
41 deviceIPOptions: [
42+ ['static', 'Static'],
43 ['dynamic', 'Dynamic'],
44- ['static', 'Static'],
45 ['external', 'External']
46 ],
47 mac_address: discovered.mac_address,
48
49=== modified file 'src/maasserver/static/partials/dashboard.html'
50--- src/maasserver/static/partials/dashboard.html 2017-02-17 14:23:04 +0000
51+++ src/maasserver/static/partials/dashboard.html 2017-03-30 03:46:51 +0000
52@@ -152,12 +152,12 @@
53 data-ng-if="convertTo.type === 'interface'"></maas-obj-field>
54 </fieldset>
55 <fieldset class="form__fieldset six-col last-col">
56+ <maas-obj-field type="options" subtle="false" key="ip_assignment" label="IP assignment" placeholder="Select IP assignment"
57+ options="option[0] as option[1] for option in convertTo.deviceIPOptions" label-width="two" input-width="three"></maas-obj-field>
58 <maas-obj-field type="options" subtle="false" key="parent" label="Parent" placeholder="Select parent (optional)" placeholder-enabled="true"
59 options="machine.system_id as machine.fqdn for machine in machines | filter:{status_code: 6} | orderBy:'fqdn'"
60 label-width="two" label-info="Assign this device as a child of the parent machine." input-width="three"
61 data-ng-if="convertTo.type === 'device'"></maas-obj-field>
62- <maas-obj-field type="options" subtle="false" key="ip_assignment" label="IP assignment" placeholder="Select IP assignment"
63- options="option[0] as option[1] for option in convertTo.deviceIPOptions" label-width="two" input-width="three"></maas-obj-field>
64 </fieldset>
65 </div>
66 </div>