Merge "Do not crash when deleting image or volume with no name" into …

…stable/essex
openstack · Aug 29, 2012 · 648b078 · 648b078
2 parents f862d9e + 8889311
commit 648b078
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -47,6 +47,7 @@ Tihomir Trifonov <t.trifonov@gmail.com>
 Todd Willey <todd@ansolabs.com>
 Tomasz 'Zen' Napierala <tomasz@napierala.org>
 Tres Henry <tres@treshenry.net>
+Vincent Untz <vuntz@suse.com>
 Vishvananda Ishaya <vishvananda@gmail.com>
 Yuriy Taraday <yorik.sar@gmail.com>
 ZhongYue Luo <lzyeval@gmail.com>

diff --git a/horizon/dashboards/nova/images_and_snapshots/images/tables.py b/horizon/dashboards/nova/images_and_snapshots/images/tables.py
@@ -100,3 +100,6 @@ class Meta:
         table_actions = (DeleteImage,)
         row_actions = (LaunchImage, EditImage, DeleteImage)
         pagination_param = "image_marker"
+
+    def get_object_display(self, obj):
+        return obj.name or obj.id
diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py
@@ -119,7 +119,7 @@ class VolumesTableBase(tables.DataTable):
                            status_choices=STATUS_CHOICES)
 
     def get_object_display(self, obj):
-        return obj.display_name
+        return obj.display_name or obj.id
 
 
 class VolumesTable(VolumesTableBase):