Merge ~blake-rouse/maas:split-webui-tabs into maas:master

Proposed by Данило Шеган
Status: Rejected
Rejected by: Andres Rodriguez
Proposed branch: ~blake-rouse/maas:split-webui-tabs
Merge into: maas:master
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
MAAS Maintainers Pending
Review via email: mp+331137@code.launchpad.net

Commit message

Split out the node tabs into seperate pages in the navigation bar.

Each page still uses the NodesListController with a new routePage dependency that tells the controller what page is being shown. This help keep the branch small and reduce the chance of regressions as it all the same JS, the HTML is just split up. This also helps the readability of the HTML templates.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

I've attempted to get the diff to appear by resubmitting this, but it still failed (I suspected it was a failed job on the Launchpad side, but maybe it's something about branches instead).

Revision history for this message
Данило Шеган (danilo) wrote :
Revision history for this message
Данило Шеган (danilo) wrote :

Ok, merging manually indicates there's a conflict:

CONFLICT (modify/delete): src/maasserver/static/partials/nodes-list.html deleted in 0cd57a8c1f103c9fec29d8688976b9c8769a2f5a and modified in HEAD. Version HEAD of src/maasserver/static/partials/nodes-list.html left in tree.

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b split-webui-tabs lp:~blake-rouse/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/529/console
COMMIT: 0cd57a8c1f103c9fec29d8688976b9c8769a2f5a

review: Needs Fixing

Unmerged commits

0cd57a8... by Blake Rouse

Split out the node tabs into seperate pages in the navigation bar.

Subscribers

People subscribed via source and target branches