openstack/horizon
Code Issues Proposed changes

Merge "Sort image source choices by name for volume"

Browse Source
This commit is contained in:
Zuul 2024-08-27 17:49:52 +00:00 committed by Gerrit Code Review
commit 5daabe542d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/dashboards/project/volumes/forms.py
View File

@ -252,12 +252,15 @@ class CreateForm(forms.SelfHandlingForm):
request.user.tenant_id) request.user.tenant_id)
if images: if images:
source_type_choices.append(("image_source", _("Image"))) source_type_choices.append(("image_source", _("Image")))
choices = [('', _("Choose an image"))] choices = []
for image in images: for image in images:
image.bytes = image.size image.bytes = image.size
image.size = functions.bytes_to_gigabytes(image.bytes) image.size = functions.bytes_to_gigabytes(image.bytes)
choices.append((image.id, image)) choices.append((image.id, image))
self.fields['image_source'].choices = choices sorted_choices = sorted(
choices, key=lambda x: (x[1].name if x[1].name else ''))
sorted_choices.insert(0, ('', _("Choose an image")))
self.fields['image_source'].choices = sorted_choices
else: else:
del self.fields['image_source'] del self.fields['image_source']