MAAS

Merge ~blake-rouse/maas:fix-1770741 into maas:master

  1. Git
  2. lp:~blake-rouse/maas
  3. fix-1770741
  4. Merge into master
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: a282797e0c1b585548968a311b91510bcee2f338
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~blake-rouse/maas:fix-1770741
Merge into: maas:master
Diff against target: 63 lines (+12/-6)
1 file modified
src/maasserver/static/partials/node-details.html (+12/-6)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander unittests Pending
Review via email: mp+345621@code.launchpad.net

Commit message

LP: #1770741 and #1742270 - Fix interfaces UI for controllers.

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
1diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
2index 7e78d3f..9de5835 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -1039,6 +1039,7 @@
6 <span class="ng-hide" data-ng-show="tableInfo.column == 'mac'" title="{$ interface.mac_address $}">{$ interface.mac_address $}</span>
7 <input type="text" class="p-form-validation__input u-no-margin--top"
8 data-ng-if="isEditing(interface) && interface.type !== 'vlan'"
9+ data-ng-disabled="isController"
10 data-ng-model="editInterface.name">
11 </td>
12 <td class="table-col--7" aria-label="Boot interface">
13@@ -1221,6 +1222,7 @@
14 </div>
15 <maas-obj-field type="text" key="mac_address" label="MAC address" label-width="2" input-width="5"
16 data-ng-if="interface.type !== 'alias' && interface.type !== 'vlan'" disable-label="false"
17+ disabled="isController"
18 input-class="table__input u-margin--none" placeholder="00:00:00:00:00:00"></maas-obj-field>
19 <maas-obj-field type="tags" key="tags" label="Tags" label-width="2" input-width="5"
20 placeholder="Add a tag"
21@@ -1235,14 +1237,15 @@
22 options="fabric as fabric.name for fabric in fabrics"></maas-obj-field>
23 <maas-obj-field type="options" key="vlan" label="VLAN" label-width="2" input-width="5"
24 disable-label="false"
25- data-ng-if="editInterface.$maasForm.getValue('fabric')"
26- disabled="interface.type === 'physical' || interface.type === 'bond'"
27+ data-ng-show="editInterface.$maasForm.getValue('fabric')"
28+ disabled="isController || interface.type === 'physical' || interface.type === 'bond'"
29 on-change="vlanChangedForm"
30 options="vlan as getVLANText(vlan) for vlan in vlans | removeDefaultVLANIfVLAN:interface.type | filterByFabric:editInterface.$maasForm.getValue('fabric')">
31 </maas-obj-field>
32 <maas-obj-field type="options" key="subnet" label="Subnet" placeholder="Unconfigured" placeholder-enabled="true"
33 disable-label="false" label-width="2" input-width="5"
34- data-ng-if="editInterface.$maasForm.getValue('fabric')"
35+ data-ng-show="editInterface.$maasForm.getValue('fabric')"
36+ disabled="isController"
37 on-change="subnetChangedForm"
38 options="subnet as getSubnetText(subnet) for subnet in subnets | filterByVLAN:editInterface.$maasForm.getValue('vlan')">
39 </maas-obj-field>
40@@ -1250,17 +1253,20 @@
41 data-ng-init="editInterface.subnet = editInterface.defaultSubnet" label-width="2" input-width="5"
42 data-ng-if="editInterface.$maasForm.getValue('ip_assignment') === 'static'"
43 on-change="subnetChangedForm"
44+ disabled="isController"
45 disable-label="false"
46 options="subnet as getSubnetText(subnet) for subnet in subnets"></maas-obj-field>
47 <maas-obj-field type="options" key="mode" label="IP mode" label-width="2" input-width="5"
48 disable-label="false"
49 data-ng-if="editInterface.$maasForm.getValue('fabric') && !isLinkModeDisabled(editInterface.$maasForm)"
50- options="mode.mode as mode.text for mode in modes | filterLinkModes:editInterface.$maasForm">
51- on-change="modeChangedForm"
52+ options="mode.mode as mode.text for mode in modes | filterLinkModes:editInterface.$maasForm"
53+ disabled="isController"
54+ on-change="modeChangedForm">
55 </maas-obj-field>
56 <maas-obj-field type="text" key="ip_address" label="IP address" placeholder="IP Address" label-width="two" input-width="three"
57 disable-label="false" input-class="table__input u-margin--none"
58- data-ng-if="(editInterface.$maasForm.getValue('fabric') && editInterface.$maasForm.getValue('mode') == 'static')">
59+ data-ng-if="(editInterface.$maasForm.getValue('fabric') && editInterface.$maasForm.getValue('mode') == 'static')"
60+ disabled="isController">
61 </maas-obj-field>
62 </div>
63 </div>

Subscribers

People subscribed via source and target branches