diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 08:08:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 08:08:34 +0000 |
commit | 16f80e78c0aa9f9d00e9414011a497518a090e12 (patch) | |
tree | 21a1dd60ec99d51df113a7213345d6296d2c9a81 /tuskar_ui/infrastructure/images/tables.py | |
parent | 6f56762191656abef93349f2e68b71839672a364 (diff) | |
parent | a5c32aea36198ea2d15309cd8d7cd45df7f27571 (diff) | |
download | tuskar-ui-16f80e78c0aa9f9d00e9414011a497518a090e12.tar.gz |
Merge "Properly handle provisioning images"
Diffstat (limited to 'tuskar_ui/infrastructure/images/tables.py')
-rw-r--r-- | tuskar_ui/infrastructure/images/tables.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tuskar_ui/infrastructure/images/tables.py b/tuskar_ui/infrastructure/images/tables.py index 8bd8bbf4..bbc8c0a9 100644 --- a/tuskar_ui/infrastructure/images/tables.py +++ b/tuskar_ui/infrastructure/images/tables.py @@ -61,9 +61,9 @@ class ImagesTable(tables.DataTable): verbose_name=_("Image Name")) disk_format = tables.Column('disk_format', verbose_name=_("Format")) - role = tables.Column(lambda image: - image.role.name if image.role else '-', - verbose_name=_("Deployment Role")) + roles = tables.Column(lambda image: + ', '.join([r.name for r in image.roles]), + verbose_name=_("Deployment Roles")) class Meta(object): name = "images" |