← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/instances/views.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-10-16 20:10:52 UTC
  • mfrom: (1.1.33)
  • Revision ID: package-import@ubuntu.com-20131016201052-k2vzlfjl6g4m0wbk
Tags: 1:2013.2~rc3-0ubuntu1
https://launchpad.net/bugs/1240665
New upstream release candidate (LP: #1240665).

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/instances/views.py
88
88
 
89
89
            # Loop through instances to get flavor info.
90
90
            for instance in instances:
91
 
                if (hasattr(instance, 'image')
92
 
                        and instance.image['id'] in image_map):
93
 
                    instance.image = image_map[instance.image['id']]
 
91
                if hasattr(instance, 'image'):
 
92
                    # Instance from image returns dict
 
93
                    if isinstance(instance.image, dict):
 
94
                        if instance.image.get('id') in image_map:
 
95
                            instance.image = image_map[instance.image['id']]
 
96
                    else:
 
97
                        # Instance from volume returns a string
 
98
                        instance.image = {'name':
 
99
                                instance.image if instance.image else _("-")}
94
100
 
95
101
                try:
96
102
                    flavor_id = instance.flavor["id"]