Merge ~ya-bo-ng/maas:commissioning-qa into ~deadlight/maas:vanilla

Proposed by Anthony Dillon
Status: Merged
Approved by: Karl Williams
Approved revision: cea22c88ef99b22dd4c28b82af4dafcfdad4cbf3
Merged at revision: 48de4d30e3256a4b1d01eae746eed435049cd25e
Proposed branch: ~ya-bo-ng/maas:commissioning-qa
Merge into: ~deadlight/maas:vanilla
Diff against target: 20 lines (+3/-3)
1 file modified
src/maasserver/static/partials/script-results-list.html (+3/-3)
Reviewer Review Type Date Requested Status
Karl Williams Approve
Review via email: mp+337578@code.launchpad.net

Description of the change

## Done
Aligned the previous commissioning results with the parent table.

## QA
- Go to a node details
- Click on commissioning
- Use the menu in the table to view the previous scripts
- Check that the name and icon are now next to eachother

Fixes https://github.com/ubuntudesign/MAAS-design-squad/issues/247

To post a comment you must log in.
Revision history for this message
Karl Williams (deadlight) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/script-results-list.html b/src/maasserver/static/partials/script-results-list.html
2index 0e3c325..f237f09 100644
3--- a/src/maasserver/static/partials/script-results-list.html
4+++ b/src/maasserver/static/partials/script-results-list.html
5@@ -72,12 +72,12 @@
6 <table>
7 <tbody>
8 <tr data-ng-repeat="item in result.history_list">
9- <td class="col-2" aria-label="Status">
10+ <td class="col-3" aria-label="Name">
11 <span data-maas-script-status="script-status" data-script-status="item.status"></span>
12+ {$ result.name $}
13 </td>
14- <td class="col-2" aria-label="Name">{$ result.name $}</td>
15 <td class="col-2" aria-label="Tags">{$ result.tags $}</td>
16- <td class="col-2" aria-label="Runtime"><span data-maas-script-run-time="script-runtime" data-start-time="item.starttime" data-run-time="{{item.runtime}}" data-estimated-run-time="{{item.estimated_runtime}}" data-script-status="item.status"></span></td>
17+ <td class="col-1" aria-label="Runtime"><span data-maas-script-run-time="script-runtime" data-start-time="item.starttime" data-run-time="{{item.runtime}}" data-estimated-run-time="{{item.estimated_runtime}}" data-script-status="item.status"></span></td>
18 <td class="col-2" aria-label="Date">{$ item.updated $}</td>
19 <td class="col-2" aria-label="Status">
20 <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->

Subscribers

People subscribed via source and target branches

to all changes: