From 1d2101d45ad2c5e08efcd46e0d370ed2129bab06 Mon Sep 17 00:00:00 2001 From: Ekaterina Fedorova Date: Wed, 27 Nov 2013 10:59:29 +0400 Subject: [PATCH] Add NotFound exception handling in service_list Fix quotes Change-Id: Ia4532475f18731e9cec7ff4493faf52ffd309ae5 --- muranodashboard/environments/views.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/muranodashboard/environments/views.py b/muranodashboard/environments/views.py index 3f41649b4..fb20be78a 100644 --- a/muranodashboard/environments/views.py +++ b/muranodashboard/environments/views.py @@ -186,7 +186,7 @@ class Services(tables.DataTableView): context['environment_name'] = environment_name except: - msg = _('Sorry, this environment does\'t exist anymore') + msg = _("Sorry, this environment does't exist anymore") redirect = reverse("horizon:murano:environments:index") exceptions.handle(self.request, msg, redirect=redirect) return context @@ -203,11 +203,15 @@ class Services(tables.DataTableView): exceptions.handle(self.request, msg, redirect=reverse(ns_url)) except HTTPInternalServerError: - msg = _('Environment with id %s doesn\'t exist anymore' + msg = _("Environment with id %s doesn't exist anymore" % self.environment_id) exceptions.handle(self.request, msg, redirect=reverse(ns_url)) except HTTPUnauthorized: exceptions.handle(self.request) + except HTTPNotFound: + msg = _("Environment with id %s doesn't exist anymore" + % self.environment_id) + exceptions.handle(self.request, msg, redirect=reverse(ns_url)) return services @@ -302,7 +306,7 @@ class DeploymentsView(tables.DataTableView): self.environment_id) context['environment_name'] = environment_name except: - msg = _('Sorry, this environment does\'t exist anymore') + msg = _("Sorry, this environment doesn't exist anymore") redirect = reverse("horizon:murano:environments:index") exceptions.handle(self.request, msg, redirect=redirect) return context @@ -320,7 +324,7 @@ class DeploymentsView(tables.DataTableView): exceptions.handle(self.request, msg, redirect=reverse(ns_url)) except HTTPInternalServerError: - msg = _('Environment with id %s doesn\'t exist anymore' + msg = _("Environment with id %s doesn't exist anymore" % self.environment_id) exceptions.handle(self.request, msg, redirect=reverse(ns_url)) return deployments @@ -349,7 +353,7 @@ class DeploymentDetailsView(tabs.TabbedTableView): self.environment_id, self.deployment_id) except (HTTPInternalServerError, HTTPNotFound): - msg = _('Deployment with id %s doesn\'t exist anymore' + msg = _("Deployment with id %s doesn't exist anymore" % self.deployment_id) redirect = reverse("horizon:murano:environments:deployments") exceptions.handle(self.request, msg, redirect=redirect)