x/tuskar-ui
Code Issues Proposed changes

Adds default text for keypair select widget on launch form.

Browse Source 
Fixes bug 953488.

Change-Id: I089f281111203959995fb0ca5068cd2aabcd2b18
This commit is contained in:
Gabriel Hurley 2012-03-12 19:02:37 -07:00
parent 2c2a583182
commit b820fba2fe
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/dashboards/nova/images_and_snapshots/images/forms.py
View File

@ -127,6 +127,10 @@ class LaunchForm(forms.SelfHandlingForm):
def __init__(self, *args, **kwargs):
flavor_list = kwargs.pop('flavor_list')
keypair_list = kwargs.pop('keypair_list')
if keypair_list:
keypair_list.insert(0, ("", _("Select a keypair")))
else:
keypair_list = (("", _("No keypairs available.")),)
security_group_list = kwargs.pop('security_group_list')
volume_list = kwargs.pop('volume_list')
super(LaunchForm, self).__init__(*args, **kwargs)

4
horizon/dashboards/nova/images_and_snapshots/images/tests.py
View File

@ -62,7 +62,7 @@ class ImageViewTests(test.TestCase):
self.assertIn(self.flavors.first().name,
form.fields['flavor'].choices[0][1])
self.assertEqual(self.keypairs.first().name,
form.fields['keypair'].choices[0][0])
form.fields['keypair'].choices[1][0])
def test_launch_post(self):
flavor = self.flavors.first()
@ -166,7 +166,7 @@ class ImageViewTests(test.TestCase):
res = self.client.get(url)
self.assertTemplateUsed(res,
'nova/images_and_snapshots/images/launch.html')
self.assertEqual(len(res.context['form'].fields['keypair'].choices), 0)
self.assertEqual(len(res.context['form'].fields['keypair'].choices), 1)
def test_launch_form_keystone_exception(self):
flavor = self.flavors.first()