openstack
/
horizon
Code Issues Proposed changes

Merge "Correct error messages on create and update router form"

This commit is contained in:
Zuul 2019-06-24 08:47:01 +00:00 committed by Gerrit Code Review
parent bfeb20a2e1 248b8e9715
commit d1a2db6d19
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/project/routers/forms.py
View File

@ -147,7 +147,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
@ -207,5 +210,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)