Correct error messages on create and update router form

The name is not required, so data["name"] may be empty.
When data["name"] is empty, get the id value.
This patch correct error messages on create and update form

Change-Id: I9d5eebf65501c5e182a9a135c97461ff3fcf57e7
This commit is contained in:
pengyuesheng 2019-05-13 14:16:59 +08:00
parent 8c125fa5ad
commit 248b8e9715
1 changed files with 6 additions and 2 deletions

View File

@ -145,7 +145,10 @@ class CreateForm(forms.SelfHandlingForm):
if exc.status_code == 409:
msg = _('Quota exceeded for resource router.')
else:
msg = _('Failed to create router "%s".') % data['name']
if data["name"]:
msg = _('Failed to create router "%s".') % data['name']
else:
msg = _('Failed to create router.')
redirect = reverse(self.failure_url)
exceptions.handle(request, msg, redirect=redirect)
return False
@ -203,5 +206,6 @@ class UpdateForm(forms.SelfHandlingForm):
except Exception as exc:
LOG.info('Failed to update router %(id)s: %(exc)s',
{'id': self.initial['router_id'], 'exc': exc})
msg = _('Failed to update router %s') % data['name']
name_or_id = data['name'] or self.initial['router_id']
msg = _('Failed to update router %s') % name_or_id
exceptions.handle(request, msg, redirect=self.redirect_url)