Merge lp:~jakedahn/horizon/lp77670 into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

This branch adds the instance 'display name' (nickname) to attach the attache volume to instance form.

[Devin Carlen (devcamcar)]

9 + choices = [(i.id, i.id + " ("+i.displayName+")")
10 + for i in project.get_instances()]

can be

9 + choices = [(i.id, "%s (%s)" % (i.id, i.displayName)
10 + for i in project.get_instances()]

review: Needs Fixing

[lp:~jakedahn/horizon/lp77670]

46. By Jake Dahn on 2011-05-04

changing string formatting

[Jake Dahn (jakedahn)]

Right-o, updated string formatting. I take it that concatenation by '+' is generally seen as a bad thing then?

review: Needs Resubmitting

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[lp:~jakedahn/horizon/lp77670]

47. By Jake Dahn on 2011-05-04

adding the forgotten parentheses

Unmerged revisions

=== modified file 'django-nova/src/django_nova/forms.py'
--- django-nova/src/django_nova/forms.py	2011-03-18 17:08:27 +0000
+++ django-nova/src/django_nova/forms.py	2011-05-04 06:17:25 +0000
@@ -48,7 +48,8 @@
     return rv
 
 def get_instance_choices(project):
-    choices = [(i.id, i.id) for i in project.get_instances()]
+    choices = [(i.id, "%s (%s)" % (i.id, i.displayName)
+               for i in project.get_instances()]
     if not len(choices):
         choices = [('', 'none available')]
     return choices