From 3e3686657f4eb5a95e584b6d4c179aac4b5a28da Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 15 Dec 2020 15:01:15 +0000 Subject: [PATCH] --- ayanova/src/views/home-memo.vue | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue index 740faf03..ef242245 100644 --- a/ayanova/src/views/home-memo.vue +++ b/ayanova/src/views/home-memo.vue @@ -237,7 +237,7 @@ export default { } }, async beforeRouteLeave(to, from, next) { - if (!this.formState.dirty || JUST_DELETED) { + if (!this.formState.dirty || LEAVE_OK) { next(); return; } @@ -454,18 +454,8 @@ export default { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { + LEAVE_OK = true; vm.$router.go(-1); - // vm.pickListSelectedUserId = null; - // vm.items = []; - // vm.toUsers = []; - // vm.obj.notes = null; - // vm.obj.name = null; - // //Only a post, no data returned - // window.$gz.form.setFormState({ - // vm: vm, - // dirty: false - // }); - // vm.updateSave(); } } catch (ex) { window.$gz.errorHandler.handleFormError(ex, vm); @@ -492,7 +482,7 @@ export default { //No need to delete a new record, just abandon it... if (vm.$route.params.recordid == 0) { //this should not get offered for delete but to be safe and clear just in case: - JUST_DELETED = true; + LEAVE_OK = true; // navigate backwards vm.$router.go(-1); } else { @@ -506,7 +496,7 @@ export default { } else { //workaround to prevent warning about leaving dirty record //For some reason I couldn't just reset isdirty in formstate - JUST_DELETED = true; + LEAVE_OK = true; // navigate backwards vm.$router.go(-1); } @@ -677,7 +667,7 @@ function generateMenu(vm) { window.$gz.eventBus.$emit("menu-change", menuOptions); } -let JUST_DELETED = false; +let LEAVE_OK = false; ///////////////////////////////// //