MAAS

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

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

Commit message

LP: #1771658 - Fix disabled interface settings for machines. Fix small UI issues with editing VLANs.

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 9de5835..9889c79 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -1035,7 +1035,7 @@
6 data-ng-click="toggleInterfaceSelect(interface)"
7 data-ng-disabled="isDisabled()">
8 </span>
9- <span data-ng-if="!isEditing(interface)" data-ng-show="tableInfo.column == 'name'" title="{$ interface.name $}">{$ interface.name $}</span>
10+ <span data-ng-if="!isEditing(interface) || interface.type === 'vlan'" data-ng-show="tableInfo.column == 'name'" title="{$ interface.name $}">{$ interface.name $}</span>
11 <span class="ng-hide" data-ng-show="tableInfo.column == 'mac'" title="{$ interface.mac_address $}">{$ interface.mac_address $}</span>
12 <input type="text" class="p-form-validation__input u-no-margin--top"
13 data-ng-if="isEditing(interface) && interface.type !== 'vlan'"
14@@ -1045,12 +1045,12 @@
15 <td class="table-col--7" aria-label="Boot interface">
16 <span class="u-align--center u-hide u-show--large">
17 <input type="radio" name="bootInterface" id="{$ interface.name $}" checked
18- data-ng-if="!isController && isBootInterface(interface)"
19+ data-ng-if="!isController && isBootInterface(interface) && !isEditing(interface)"
20 class="u-no-margin--right">
21 <label for="{$ interface.name $}"></label>
22 </span>
23- <span class="u-hide--large" data-ng-if="!isController && isBootInterface(interface)">Yes</span>
24- <span class="u-hide--large" data-ng-if="!isController && !isBootInterface(interface)">No</span>
25+ <span class="u-hide--large" data-ng-if="!isController && isBootInterface(interface) && !isEditing(interface)">Yes</span>
26+ <span class="u-hide--large" data-ng-if="!isController && !isBootInterface(interface) && !isEditing(interface)">No</span>
27 </td>
28 <td class="table-col--9" aria-label="Type">
29 <span data-ng-if="!isEditing(interface)" title="{$ getInterfaceTypeText(interface) $}">{$ getInterfaceTypeText(interface) $}</span>
30@@ -1237,36 +1237,31 @@
31 options="fabric as fabric.name for fabric in fabrics"></maas-obj-field>
32 <maas-obj-field type="options" key="vlan" label="VLAN" label-width="2" input-width="5"
33 disable-label="false"
34- data-ng-show="editInterface.$maasForm.getValue('fabric')"
35- disabled="isController || interface.type === 'physical' || interface.type === 'bond'"
36+ data-ng-show="!isController && editInterface.$maasForm.getValue('fabric')"
37 on-change="vlanChangedForm"
38 options="vlan as getVLANText(vlan) for vlan in vlans | removeDefaultVLANIfVLAN:interface.type | filterByFabric:editInterface.$maasForm.getValue('fabric')">
39 </maas-obj-field>
40 <maas-obj-field type="options" key="subnet" label="Subnet" placeholder="Unconfigured" placeholder-enabled="true"
41 disable-label="false" label-width="2" input-width="5"
42- data-ng-show="editInterface.$maasForm.getValue('fabric')"
43- disabled="isController"
44+ data-ng-show="!isController && editInterface.$maasForm.getValue('fabric')"
45 on-change="subnetChangedForm"
46 options="subnet as getSubnetText(subnet) for subnet in subnets | filterByVLAN:editInterface.$maasForm.getValue('vlan')">
47 </maas-obj-field>
48 <maas-obj-field type="options" key="subnet" label="Subnet" placeholder="Unconfigured" placeholder-enabled="true"
49 data-ng-init="editInterface.subnet = editInterface.defaultSubnet" label-width="2" input-width="5"
50- data-ng-if="editInterface.$maasForm.getValue('ip_assignment') === 'static'"
51+ data-ng-if="!isController && editInterface.$maasForm.getValue('ip_assignment') === 'static'"
52 on-change="subnetChangedForm"
53- disabled="isController"
54 disable-label="false"
55 options="subnet as getSubnetText(subnet) for subnet in subnets"></maas-obj-field>
56 <maas-obj-field type="options" key="mode" label="IP mode" label-width="2" input-width="5"
57 disable-label="false"
58- data-ng-if="editInterface.$maasForm.getValue('fabric') && !isLinkModeDisabled(editInterface.$maasForm)"
59+ data-ng-if="!isController && editInterface.$maasForm.getValue('fabric') && !isLinkModeDisabled(editInterface.$maasForm)"
60 options="mode.mode as mode.text for mode in modes | filterLinkModes:editInterface.$maasForm"
61- disabled="isController"
62 on-change="modeChangedForm">
63 </maas-obj-field>
64 <maas-obj-field type="text" key="ip_address" label="IP address" placeholder="IP Address" label-width="two" input-width="three"
65 disable-label="false" input-class="table__input u-margin--none"
66- data-ng-if="(editInterface.$maasForm.getValue('fabric') && editInterface.$maasForm.getValue('mode') == 'static')"
67- disabled="isController">
68+ data-ng-if="!isController && editInterface.$maasForm.getValue('fabric') && editInterface.$maasForm.getValue('mode') == 'static'">
69 </maas-obj-field>
70 </div>
71 </div>

Subscribers

People subscribed via source and target branches