Merge ~steverydz/maas:1845613-dhcp-col-bug into maas:master
Proposed by
Steve Rydz
Status: | Merged |
---|---|
Approved by: | Steve Rydz |
Approved revision: | de1a8ff9f655694f9259cc9ff8307e5e9d72a3c5 |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~steverydz/maas:1845613-dhcp-col-bug |
Merge into: | maas:master |
Diff against target: |
40 lines (+12/-5) 2 files modified
src/maasserver/static/js/angular/controllers/node_details_networking.js (+7/-5) src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js (+5/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Caleb Ellis (community) | Approve | ||
MAAS Lander | Approve | ||
Adam Collard (community) | Approve | ||
Review via email: mp+373313@code.launchpad.net |
Commit message
LP: #1845613 - Add null check to prevent template string showing in UI
Description of the change
Done:
Add null check for the vlan parameter to prevent an error causing the angular template string to show in the UI.
QA:
- Go to a machine detail page and go to the network tab
- Edit a physical machine and disconnect it from a fabric
- See that the DHCP column in the table shows "No DHCP"
To post a comment you must log in.
LGTM