Merge lp://qastaging/~blake-rouse/maas/fix-1378366 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3204 |
Proposed branch: | lp://qastaging/~blake-rouse/maas/fix-1378366 |
Merge into: | lp://qastaging/~maas-committers/maas/trunk |
Diff against target: |
161 lines (+71/-9) 4 files modified
contrib/preseeds_v2/curtin_userdata_windows (+2/-0) src/maasserver/templates/maasserver/cluster_listing_row.html (+23/-9) src/maasserver/views/clusters.py (+2/-0) src/maasserver/views/tests/test_clusters.py (+44/-0) |
To merge this branch: | bzr merge lp://qastaging/~blake-rouse/maas/fix-1378366 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email:
|
Commit message
Show no images available on the WebUI, if the region has not images for the cluster to import.
To post a comment you must log in.
Looks good but:
a) there is a test missing for when the code hits '{% elif not region_has_images %}' in the cluster_ listing_ row.html template. This should be fixed before this branch lands.
b) as Kiko suggested, the test in the template could be improved by defining a list (["Disconnected", "Out-of-sync"]) in the context and using it. But I wouldn't hold this branch for this.