Merge lp:~julian-edwards/maas/backport-r1294-1299 into lp:maas/1.2
Proposed by
Julian Edwards
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Julian Edwards | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1324 | ||||
Proposed branch: | lp:~julian-edwards/maas/backport-r1294-1299 | ||||
Merge into: | lp:maas/1.2 | ||||
Diff against target: |
328 lines (+189/-9) 6 files modified
src/maasserver/static/css/components/table_list.css (+13/-0) src/maasserver/templates/maasserver/node_list.html (+1/-1) src/maasserver/templates/maasserver/nodes_listing.html (+16/-0) src/maasserver/templates/maasserver/tag_view.html (+1/-1) src/maasserver/tests/test_views_nodes.py (+115/-5) src/maasserver/views/nodes.py (+43/-2) |
||||
To merge this branch: | bzr merge lp:~julian-edwards/maas/backport-r1294-1299 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email: mp+137493@code.launchpad.net |
Commit message
Fix bug #994887: Nodes list view now supports sorting by hostname(mac) or status columns. (backport r1294 and r1299 from trunk)
To post a comment you must log in.