← Back to branch summary

~newell-jensen/maas/fix-1619262

« back to all changes in this revision

Viewing changes to src/maasserver/static/partials/dashboard.html

[r=blake-rouse][bug=1627039][author=mpontillo] Add is_external_dhcp boolean to discovery view.

 * Update SQL to select a boolean from the related VLAN to 
   determine if the discovered IP address is a DHCP server.
 * Update websocket tests to account for the new field.
 * Expose the DHCP server indicator in the dashboard HTML.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/static/partials/dashboard.html
73
73
                        <div data-ng-if="discovery.discovery_id !== selectedDevice"
74
74
                            data-ng-dblclick="toggleSelected(discovery.discovery_id)">
75
75
                            <div class="table__data table-col--20">
76
 
                                {$ getDiscoveryName(discovery) $} <i class="icon icon--info tooltip u-margin--left-tiny ng-hide" aria-label="This device is providing DHCP"></i>
 
76
                                {$ getDiscoveryName(discovery) $}
 
77
                                <i data-ng-show="discovery.is_external_dhcp === true" class="icon icon--info tooltip u-margin--left-tiny ng-hide" aria-label="This device is providing DHCP."></i>
77
78
                            </div>
78
79
                            <div class="table__data table-col--20" data-ng-if="column === 'mac'">
79
80
                                {$ discovery.mac_address $}