From 104c474479e9a89d22b96777378ff59983c03393 Mon Sep 17 00:00:00 2001 From: Kevin Masterson Date: Mon, 15 Feb 2021 12:45:37 -0500 Subject: [PATCH] Now checks for code 202 when checking for success for other operations. Task: 41574 Story: 2008505 Change-Id: I58ea7dc0aae66a38a00ed68e6c6b2cd9a4cbd32b --- adjutant_ui/content/notifications/tables.py | 2 +- adjutant_ui/content/quota/tables.py | 2 +- adjutant_ui/content/tasks/forms.py | 2 +- adjutant_ui/content/tasks/tables.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adjutant_ui/content/notifications/tables.py b/adjutant_ui/content/notifications/tables.py index 672fdcb..b52e2d1 100644 --- a/adjutant_ui/content/notifications/tables.py +++ b/adjutant_ui/content/notifications/tables.py @@ -44,7 +44,7 @@ class AcknowlegeNotifcation(tables.BatchAction): def action(self, request, obj_id): result = adjutant.notifications_acknowlege(request, obj_id) - if not result or result.status_code != 200: + if not result or result.status_code not in [200, 202]: exception = exceptions.NotAvailable() exception._safe_message = False raise exception diff --git a/adjutant_ui/content/quota/tables.py b/adjutant_ui/content/quota/tables.py index 9845eb9..91fb1d9 100644 --- a/adjutant_ui/content/quota/tables.py +++ b/adjutant_ui/content/quota/tables.py @@ -77,7 +77,7 @@ class CancelQuotaTask(tables.DeleteAction): def delete(self, request, obj_id): result = adjutant.task_cancel(request, obj_id) - if not result or result.status_code != 200: + if not result or result.status_code not in [200, 202]: exception = exceptions.NotAvailable() exception._safe_message = False raise exception diff --git a/adjutant_ui/content/tasks/forms.py b/adjutant_ui/content/tasks/forms.py index de9a981..8feb2c6 100644 --- a/adjutant_ui/content/tasks/forms.py +++ b/adjutant_ui/content/tasks/forms.py @@ -43,7 +43,7 @@ class UpdateTaskForm(forms.SelfHandlingForm): try: response = adjutant.task_update( request, task_id, data['task_data']) - if response.status_code == 200: + if response.status_code in [200, 202]: messages.success(request, _('Updated task successfully.')) elif response.status_code == 400: messages.error(request, _(response.text)) diff --git a/adjutant_ui/content/tasks/tables.py b/adjutant_ui/content/tasks/tables.py index 54de940..6aa7785 100644 --- a/adjutant_ui/content/tasks/tables.py +++ b/adjutant_ui/content/tasks/tables.py @@ -42,7 +42,7 @@ class CancelTask(tables.DeleteAction): def delete(self, request, obj_id): result = adjutant.task_cancel(request, obj_id) - if not result or result.status_code != 200: + if not result or result.status_code not in [200, 202]: exception = exceptions.NotAvailable() exception._safe_message = False raise exception @@ -111,7 +111,7 @@ class ReissueToken(tables.BatchAction): def action(self, request, obj_id): result = adjutant.token_reissue(request, obj_id) - if not result or result.status_code != 200: + if not result or result.status_code not in [200, 202]: exception = exceptions.NotAvailable() exception._safe_message = False raise exception @@ -144,7 +144,7 @@ class RevalidateTask(tables.BatchAction): def action(self, request, obj_id): result = adjutant.task_revalidate(request, obj_id) - if not result or result.status_code != 200: + if not result or result.status_code not in [200, 202]: exception = exceptions.NotAvailable() exception._safe_message = False raise exception