MAAS

Merge ~ltrager/maas:lp1761279 into maas:master

  1. Git
  2. lp:~ltrager/maas
  3. lp1761279
  4. Merge into master
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: 67e4c6337a38e8d69cf65b16a91f2dddb3b5157a
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1761279
Merge into: maas:master
Diff against target: 48 lines (+8/-8)
1 file modified
src/maasserver/static/partials/machines-table.html (+8/-8)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
MAAS Lander Approve
Review via email: mp+343673@code.launchpad.net

Commit message

LP: #1761279 - Don't show hardware status tooltip when icon isn't shown.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1761279 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b2c3691e3e40565a6ec3346f2a7413885a06d561

review: Approve
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Super small nit pick is that most of the pre-existing data-ng-ifs are near the back and I would keep it consistent when adding new data-ng-ifs.

review: Approve
~ltrager/maas:lp1761279 updated
67e4c63... by Lee Trager

Merge branch 'master' into lp1761279

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/machines-table.html b/src/maasserver/static/partials/machines-table.html
2index c845da1..cd4f244 100644
3--- a/src/maasserver/static/partials/machines-table.html
4+++ b/src/maasserver/static/partials/machines-table.html
5@@ -59,35 +59,35 @@
6 <i data-ng-if="showSpinner(node)" class="p-icon--spinner u-animation--spin"></i>
7 <span class="p-tooltip p-tooltip--left">
8 <i data-ng-if="showNodeStatus(node)" data-maas-script-status="script-status" data-script-status="node.other_test_status" aria-labelledby="{$ node.other_test_status_tooltip $}"></i>
9- <span class="p-tooltip__message" role="tooltip" id="other-status-tooltip-{$ node.fqdn $}">{$ node.other_test_status_tooltip $}</span>
10+ <span data-ng-if="showNodeStatus(node)" class="p-tooltip__message" role="tooltip" id="other-status-tooltip-{$ node.fqdn $}">{$ node.other_test_status_tooltip $}</span>
11 </span>
12 <span class="p-tooltip p-tooltip--left">
13 <i data-ng-if="showFailedTestWarning(node)" class="p-icon--warning" aria-describedby="failed-test-tooltip-large-{$ node.fqdn $}"></i>
14- <span class="p-tooltip__message" role="tooltip" id="failed-test-tooltip-large-{$ node.fqdn $}">{$ node.other_test_status_tooltip $}</span>
15+ <span data-ng-if="showFailedTestWarning(node)" class="p-tooltip__message" role="tooltip" id="failed-test-tooltip-large-{$ node.fqdn $}">{$ node.other_test_status_tooltip $}</span>
16 </span>
17 </span>
18 </td>
19 <td aria-label="Owner" title="{$ node.owner $}">{$ node.owner $}</td>
20 <td class="u-align--right u-hide--small" aria-label="CPU">
21 <span class="p-tooltip p-tooltip--left">
22- <span data-maas-script-status="script-status" data-script-status="node.cpu_test_status" data-ng-if="node.cpu_test_status !== 2" aria-describedby="node-cpu-tooltip-{$ node.fqdn $}"></span>
23+ <span data-maas-script-status="script-status" data-script-status="node.cpu_test_status" data-ng-if="node.cpu_test_status !== -1 && node.cpu_test_status !== 2" aria-describedby="node-cpu-tooltip-{$ node.fqdn $}"></span>
24 {$ node.cpu_count $}
25- <span class="p-tooltip__message" role="tooltip" id="node-cpu-tooltip-{$ node.fqdn $}">{$ node.cpu_test_status_tooltip $}</span>
26+ <span class="p-tooltip__message" role="tooltip" id="node-cpu-tooltip-{$ node.fqdn $}" data-ng-if="node.cpu_test_status !== -1 && node.cpu_test_status !== 2">{$ node.cpu_test_status_tooltip $}</span>
27 </span>
28 </td>
29 <td class="u-align--right u-hide--small" aria-label="Memory">
30 <span class="p-tooltip p-tooltip--left">
31- <span data-maas-script-status="script-status" data-script-status="node.memory_test_status" data-ng-if="node.memory_test_status !== 2" aria-describedby="node-memory-tooltip-{$ node.fqdn $}"></span>
32+ <span data-maas-script-status="script-status" data-script-status="node.memory_test_status" data-ng-if="node.memory_test_status !== -1 && node.memory_test_status !== 2" aria-describedby="node-memory-tooltip-{$ node.fqdn $}"></span>
33 {$ node.memory $}
34- <span class="p-tooltip__message" role="tooltip" id="node-memory-tooltip-{$ node.fqdn $}">{$ node.memory_test_status_tooltip $}</span>
35+ <span class="p-tooltip__message" role="tooltip" id="node-memory-tooltip-{$ node.fqdn $}" data-ng-if="node.memory_test_status !== -1 && node.memory_test_status !== 2">{$ node.memory_test_status_tooltip $}</span>
36 </span>
37 </td>
38 <td class="u-align--right u-hide--small " aria-label="Disks">
39 <span class="p-tooltip p-tooltip--left">
40- <span class="" data-maas-script-status="script-status" data-script-status="node.storage_test_status" data-ng-if="node.storage_test_status !== 2" aria-describedby="disk-count-tooltip-{$ node.fqdn $}">
41+ <span class="" data-maas-script-status="script-status" data-script-status="node.storage_test_status" data-ng-if="node.storage_test_status !== -1 && node.storage_test_status !== 2" aria-describedby="disk-count-tooltip-{$ node.fqdn $}">
42 </span>
43 {$ node.physical_disk_count $}
44- <span class="p-tooltip__message" role="tooltip" id="disk-count-tooltip-{$ node.fqdn $}">{$ node.storage_test_status_tooltip $}</span>
45+ <span class="p-tooltip__message" role="tooltip" id="disk-count-tooltip-{$ node.fqdn $}" data-ng-if="node.storage_test_status !== -1 && node.storage_test_status !== 2">{$ node.storage_test_status_tooltip $}</span>
46 </span>
47 </td>
48 <td class="u-align--right u-hide--small" aria-label="Storage">

Subscribers

People subscribed via source and target branches