From 9deb0d066c204a1ef8c6e4ba9f46452f857ef518 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 5 Mar 2020 20:05:05 +0000 Subject: [PATCH] --- ayanova/src/api/gzapi.js | 4 ++ ayanova/src/views/home-password.vue | 67 ++++++----------------------- 2 files changed, 16 insertions(+), 55 deletions(-) diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js index 3bfc044d..54fe3d10 100644 --- a/ayanova/src/api/gzapi.js +++ b/ayanova/src/api/gzapi.js @@ -134,6 +134,10 @@ export default { } }, json(response) { + if (response.status == 204) { + //no content, nothing to process + return response; + } return response.json(); }, apiErrorToHumanString(apiError) { diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue index 03d0ba0c..7f4cfad1 100644 --- a/ayanova/src/views/home-password.vue +++ b/ayanova/src/views/home-password.vue @@ -16,7 +16,7 @@ >{{ formState.errorBoxMessage }} - + { @@ -133,7 +140,7 @@ export default { newPassword: null, confirmPassword: null }, - reveal: false, + reveal: true, formState: { ready: false, dirty: false, @@ -187,61 +194,14 @@ export default { window.$gz.form.onChange(this, ref); } }, - // getDataFromApi() { - // var vm = this; - // vm.formState.loading = true; - // //always fetch on this form for the current logged in user id - // var url = API_BASE_URL + vm.$store.state.userId; - // window.$gz.form.deleteAllErrorBoxErrors(vm); - - // window.$gz.api - // .get(url) - // .then(res => { - // if (res.error != undefined) { - // //Not found? - // if (res.error.code == "2010") { - // //notify not found error then navigate backwards - // window.$gz.dialog - // .displayLTErrorMessage("ErrorAPI2010") - // .then(() => { - // // navigate backwards - // vm.$router.go(-1); - // }); - // } - // vm.formState.serverError = res.error; - // window.$gz.form.setErrorBoxErrors(vm); - // } else { - // vm.obj = res.data; - - // //Update the form status - // window.$gz.form.setFormState({ - // vm: vm, - // dirty: false, - // valid: true, - // loading: false, - // readOnly: res.readOnly ? true : false - // }); - // //modify the menu as necessary - // generateMenu(vm); - // } - // }) - // .catch(function handleGetDataFromAPIError(error) { - // //Update the form status - // window.$gz.form.setFormState({ - // vm: vm, - // loading: false - // }); - // window.$gz.errorHandler.handleFormError(error, vm); - // }); - // }, submit() { var vm = this; if (vm.canSave) { vm.formState.loading = true; //always submit from this form for the current logged in user id - var url = API_BASE_URL + vm.$store.state.userId; + var url = API_BASE_URL; //clear any errors vm might be around from previous submit window.$gz.form.deleteAllErrorBoxErrors(vm); @@ -253,10 +213,7 @@ export default { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { - //UserOptions is never a POST as it always exists and can't be deleted so always a PUT - - //Handle "put" of an existing record (UPDATE) - vm.obj.concurrencyToken = res.data.concurrencyToken; + //Only a post, no data returned window.$gz.form.setFormState({ vm: vm, dirty: false