diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-17 18:20:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-17 18:20:23 +0000 |
| commit | 78c8c811a3dfea12f87ccad95512f58bb980681e (patch) | |
| tree | 6eccf0137378b4504e17f75897efe63113b4fce3 | |
| parent | d3927e960deaf36a7e4f1b237d98c6816ea4eec2 (diff) | |
| parent | d1927e172bc95d96932f33c1f8f08aaf4f3aaaaa (diff) | |
| download | horizon-20.1.3.tar.gz | |
Merge "Fix flavor id auto generation" into stable/xena20.1.3
| -rw-r--r-- | openstack_dashboard/dashboards/admin/flavors/workflows.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/admin/flavors/workflows.py b/openstack_dashboard/dashboards/admin/flavors/workflows.py index 5bec75503..a186ab716 100644 --- a/openstack_dashboard/dashboards/admin/flavors/workflows.py +++ b/openstack_dashboard/dashboards/admin/flavors/workflows.py @@ -30,7 +30,7 @@ class CreateFlavorInfoAction(workflows.Action): _flavor_id_regex = (r'^[a-zA-Z0-9. _-]+$') _flavor_id_help_text = _("flavor id can only contain alphanumeric " "characters, underscores, periods, hyphens, " - "spaces.") + "spaces. Use 'auto' to automatically generate id") name = forms.CharField( label=_("Name"), max_length=255) @@ -93,7 +93,7 @@ class CreateFlavorInfoAction(workflows.Action): error_msg = _('The name "%s" is already used by ' 'another flavor.') % name self._errors['name'] = self.error_class([error_msg]) - if flavor.id == flavor_id: + if (flavor.id != 'auto') and (flavor.id == flavor_id): error_msg = _('The ID "%s" is already used by ' 'another flavor.') % flavor_id self._errors['flavor_id'] = self.error_class([error_msg]) |