Merge ~caleb-ellis/maas:machine-truncation-2.6 into maas:master
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Caleb Ellis | ||||||||
Approved revision: | 2241cbe331554d97ebe6a4fa81c6e78045e3372a | ||||||||
Merge reported by: | MAAS Lander | ||||||||
Merged at revision: | not available | ||||||||
Proposed branch: | ~caleb-ellis/maas:machine-truncation-2.6 | ||||||||
Merge into: | maas:master | ||||||||
Diff against target: |
169 lines (+81/-15) 3 files modified
src/maasserver/static/js/angular/directives/machines_table.js (+31/-9) src/maasserver/static/js/angular/directives/tests/test_machines_table.js (+30/-0) src/maasserver/static/partials/machines-table.html (+20/-6) |
||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Rydz (community) | Approve | ||
Adam Collard (community) | Needs Information | ||
MAAS Lander | Approve | ||
Review via email: mp+373912@code.launchpad.net |
Commit message
Forward port machine list truncation from 2.6 branch.
Description of the change
## Done
- Copy+pasted the machine list truncation work from the 2.6 branch to here. This adds the "Show all..." functionality and simultaneously fixes the error where machines wouldn't load (likely fixed by `MachinesManage
## QA
- Check that the machine list truncation works like in 2.6 i.e. a maximum of 5 machines show per group by default, clicking "Show all..." shows all. Test it out in grouping by status, grouping my owner, and no grouping.
- Go to a KVM details page and check that the machine list displays correctly there too.
- Go to any page that isn't the machine list and refresh the app. Navigate back to the machine list and check that the machines load in correctly.
UNIT TESTS truncation- 2.6 lp:~caleb-ellis/maas/+git/maas into -b master lp:~maas-committers/maas
-b machine-
STATUS: SUCCESS 7ebe6a4fa81c6e7 8045e3372a
COMMIT: 2241cbe331554d9