From bedecf928e5c2ae83c0860acf7fe36b55857e961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Fri, 17 Jul 2020 08:53:19 +0200 Subject: [PATCH 1/2] feature/Improve error handling at page Entitlement Requests 2 --- apimanager/entitlementrequests/views.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apimanager/entitlementrequests/views.py b/apimanager/entitlementrequests/views.py index 48bfd9d..c77487a 100644 --- a/apimanager/entitlementrequests/views.py +++ b/apimanager/entitlementrequests/views.py @@ -35,7 +35,7 @@ class IndexView(LoginRequiredMixin, TemplateView): entitlement_requests = api.get(urlpath) if 'code' in entitlement_requests and entitlement_requests['code']>=400: messages.error(self.request, entitlement_requests['message']) - entitlement_requests=[] + entitlement_requests = [] else: entitlement_requests = entitlement_requests['entitlement_requests'] entitlement_requests = FilterTime(context, self.request.GET, 'created') \ @@ -103,10 +103,13 @@ class AcceptEntitlementRequest(LoginRequiredMixin, View): try: urlpath = '/entitlement-requests/{}'.format(request.POST.get('entitlement_request_id', '')) - api.delete(urlpath) - msg = 'Entitlement Request with role {} has been deleted.'.format( - request.POST.get('role_name', '')) - messages.success(request, msg) + response = api.delete(urlpath) + if 'code' in response and response['code'] >= 400: + messages.error(self.request, response['message']) + else: + msg = 'Entitlement Request with role {} has been deleted.'.format( + request.POST.get('role_name', '')) + messages.success(request, msg) except APIError as err: messages.error(request, err) except: From 1250df8aaa4936822edb159860fe5fed5f89b656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Fri, 17 Jul 2020 09:07:32 +0200 Subject: [PATCH 2/2] feature/Improve error handling at page Consumers --- apimanager/consumers/views.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py index d5c13b2..4a81c32 100644 --- a/apimanager/consumers/views.py +++ b/apimanager/consumers/views.py @@ -74,7 +74,7 @@ class IndexView(LoginRequiredMixin, TemplateView): try: urlpath = '/management/consumers' consumers = api.get(urlpath) - if 'code' in consumers and consumers['code']==403: + if 'code' in consumers and consumers['code'] >= 400: messages.error(self.request, consumers['message']) else: consumers = FilterEnabled(context, self.request.GET)\ @@ -154,7 +154,7 @@ class DetailView(LoginRequiredMixin, FormView): call_limits_urlpath = '/management/consumers/{}/consumer/call-limits'.format(self.kwargs['consumer_id']) consumer_call_limtis = api.get(call_limits_urlpath) - if 'code' in consumer_call_limtis and consumer_call_limtis['code'] > 400: + if 'code' in consumer_call_limtis and consumer_call_limtis['code'] >= 400: messages.error(self.request, "{}".format(consumer_call_limtis['message'])) else: consumer['per_minute_call_limit'] = consumer_call_limtis['per_minute_call_limit'] @@ -184,8 +184,11 @@ class EnableDisableView(LoginRequiredMixin, RedirectView): try: urlpath = '/management/consumers/{}'.format(kwargs['consumer_id']) payload = {'enabled': self.enabled} - api.put(urlpath, payload) - messages.success(self.request, self.success) + response = api.put(urlpath, payload) + if 'code' in response and response['code'] >= 400: + messages.error(self.request, response['message']) + else: + messages.success(self.request, self.success) except APIError as err: messages.error(self.request, err) except: