From 9f4c9d19dbb9b05101274fbb108f08d3c7a2b9a0 Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Mon, 6 May 2019 17:06:18 +0800 Subject: [PATCH] Correct error messages on update network 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 update network form Change-Id: Icc1b0ad7077dedfea77d6c0225dc2747d7efc1b5 --- openstack_dashboard/dashboards/admin/networks/forms.py | 3 ++- openstack_dashboard/dashboards/project/networks/forms.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/networks/forms.py b/openstack_dashboard/dashboards/admin/networks/forms.py index 341f882d41..49a8f00e4d 100644 --- a/openstack_dashboard/dashboards/admin/networks/forms.py +++ b/openstack_dashboard/dashboards/admin/networks/forms.py @@ -351,6 +351,7 @@ class UpdateNetwork(forms.SelfHandlingForm): except Exception as e: LOG.info('Failed to update network %(id)s: %(exc)s', {'id': self.initial['network_id'], 'exc': e}) - msg = _('Failed to update network %s') % data['name'] + name_or_id = data['name'] or self.initial['network_id'] + msg = _('Failed to update network %s') % name_or_id redirect = reverse(self.failure_url) exceptions.handle(request, msg, redirect=redirect) diff --git a/openstack_dashboard/dashboards/project/networks/forms.py b/openstack_dashboard/dashboards/project/networks/forms.py index 6231c56fb9..9af56f282f 100644 --- a/openstack_dashboard/dashboards/project/networks/forms.py +++ b/openstack_dashboard/dashboards/project/networks/forms.py @@ -64,6 +64,7 @@ class UpdateNetwork(forms.SelfHandlingForm): except Exception as e: LOG.info('Failed to update network %(id)s: %(exc)s', {'id': self.initial['network_id'], 'exc': e}) - msg = _('Failed to update network %s') % data['name'] + name_or_id = data['name'] or self.initial['network_id'] + msg = _('Failed to update network %s') % name_or_id redirect = reverse(self.failure_url) exceptions.handle(request, msg, redirect=redirect)