From 8cb7da166e22f9e7af1cfcf7b2594826a896300a Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Wed, 7 Dec 2022 11:47:48 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D1=83=20=D0=BB=D0=BE=D0=B8=D0=BD=D0=B0,=20=D0=B5=D1=81?= =?UTF-8?q?=D0=BB=D0=B8=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D1=80=D0=BE=D1=87=D0=B8=D0=BB=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calendar/TheCalendar.vue | 9 ++++++--- src/pages/clients/components/ClientsTable.vue | 17 +++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index d06bca1..97ecbbd 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -105,9 +105,12 @@ export default { this.employeesData = res.results; }, fetchEmployeesData() { - fetchWrapper - .get("general/employee/") - .then((res) => this.saveEmployeesData(res)); + fetchWrapper.get("general/employee/").then((res) => { + if (res.type === "client_error") { + localStorage.clear(); + this.$router.push("/login"); + } else this.saveEmployeesData(res); + }); }, fetchEventsData() { fetchWrapper diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index fde1ffe..98ca470 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -138,12 +138,17 @@ export default { (this.currentTablePage - 1) * this.limit }` ); - this.saveDataClients(response); - this.saveClientsCount(response); - this.paginationInfo = { - currentPage: this.currentTablePage, - length: this.calculatePageCount(this.clientsCount), - }; + if (response.type === "client_error") { + localStorage.clear(); + this.$router.push("/login"); + } else { + this.saveDataClients(response); + this.saveClientsCount(response); + this.paginationInfo = { + currentPage: this.currentTablePage, + length: this.calculatePageCount(this.clientsCount), + }; + } } }, calculatePageCount(count) {