Merge ~ya-bo-ng/maas:subnets-in-interfaces into maas:master

[Anthony Dillon]

LP: #1763216 - Reinstate subnet data in interfaces table

Go to interfaces tab in node details
Behold the subnet data

[MAAS Lander (maas-lander)]

UNIT TESTS
-b subnets-in-interfaces lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fc91cf6e250ec2bf12517065979e2160a4403022

review: Approve

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 05c3c6a..72eb87a 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -1048,6 +1048,7 @@
                                     <span data-ng-if="!isEditing(interface)">{$ getVLANText(interface.vlan) $}</span>
                                 </td>
                                 <td class="table-col--13" aria-label="Subnet">
+                                    <span data-ng-if="!isEditing(interface) && ((isDevice && interface.subnet) || (interface.fabric && !interface.discovered[0].subnet_id))">{$ getSubnetText(interface.subnet) $}</span>
                                     <span data-ng-if="isAllNetworkingDisabled() && interface.discovered[0].subnet_id">
                                         {$ getSubnetText(getSubnet(interface.discovered[0].subnet_id)) $}
                                     </span>