MAAS

Merge lp:~trapnine/maas/fix-1551348 into lp:~maas-committers/maas/trunk

  1. fix-1551348
  2. Merge into trunk
Proposed by Jeffrey C Jones
Status: Merged
Approved by: Jeffrey C Jones
Approved revision: no longer in the source branch.
Merged at revision: 4704
Proposed branch: lp:~trapnine/maas/fix-1551348
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
src/maasserver/static/partials/node-details.html (+2/-2)
To merge this branch: bzr merge lp:~trapnine/maas/fix-1551348
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+287586@code.launchpad.net

Commit message

Hide the PXE column when displaying controllers.

Description of the change

Hide the PXE column when displaying controllers.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/node-details.html'
2--- src/maasserver/static/partials/node-details.html 2016-02-27 06:07:33 +0000
3+++ src/maasserver/static/partials/node-details.html 2016-03-01 07:14:01 +0000
4@@ -542,7 +542,7 @@
5 MAC
6 </a>
7 </div>
8- <div class="table__header table__column--3">PXE</div>
9+ <div class="table__header table__column--3" data-ng-hide="isController">PXE</div>
10 <div class="table__header table__column--9">Type</div>
11 <div class="table__header table__column--14">Fabric</div>
12 <div class="table__header table__column--14">VLAN</div>
13@@ -588,7 +588,7 @@
14 </a>
15 </span>
16 </div>
17- <div class="table__data table__column--3">
18+ <div class="table__data table__column--3" data-ng-hide="isController">
19 <input class="align-center" type="radio" name="bootInterface" checked
20 data-ng-if="isBootInterface(interface)">
21 </div>