From 43b955501ac57bbfef21e1352ce8c56ab43f3df8 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 19 Jul 2019 19:57:41 +0000 Subject: [PATCH] --- ayanova/src/api/errorhandler.js | 2 +- ayanova/src/api/gzform.js | 2 +- ayanova/src/components/HelloWorld.vue | 2 +- .../src/components/custom-fields-control.vue | 4 ++-- ayanova/src/components/date-time-control.vue | 2 +- .../src/components/inventorywidgetlist.vue | 2 +- ayanova/src/components/tag-picker.vue | 4 ++-- ayanova/src/main.js | 20 +++++++++---------- ayanova/src/views/About.vue | 2 +- ayanova/src/views/inventory-widget-edit.vue | 12 +++++------ ayanova/src/views/inventory.vue | 2 +- ayanova/src/views/log.vue | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ayanova/src/api/errorhandler.js b/ayanova/src/api/errorhandler.js index f4d839b5..c1a85d1b 100644 --- a/ayanova/src/api/errorhandler.js +++ b/ayanova/src/api/errorhandler.js @@ -28,7 +28,7 @@ function dealWithError(msg, vm) { //If a form instance was provided (vue instance) //then put the error into it if (vm) { - if (vm.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { //make sure formState.appError is defined on data if (!window.$gz._.has(vm, "formState.appError")) { throw "DEV ERROR errorHandler::dealWithError -> formState.appError seems to be missing from form's vue data object"; diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js index ff9be1b0..0d4521ff 100644 --- a/ayanova/src/api/gzform.js +++ b/ayanova/src/api/gzform.js @@ -322,7 +322,7 @@ export default { // serverErrors(vm, ref) { //CHECK PREREQUISITES IN DEV MODE TO ENSURE FORM ISN"T MISSING NEEDED DATA ATTRIBUTES ETC - if (vm.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { //make sure formState.serverErrors is defined on data if (!window.$gz._.has(vm, "formState.serverError")) { throw "DEV ERROR gzform::formState.serverErrors -> formState.serverError seems to be missing from form's vue data object"; diff --git a/ayanova/src/components/HelloWorld.vue b/ayanova/src/components/HelloWorld.vue index 08a82b32..1ab92705 100644 --- a/ayanova/src/components/HelloWorld.vue +++ b/ayanova/src/components/HelloWorld.vue @@ -26,7 +26,7 @@ export default { .then(() => (this.formReady = true)) .catch(err => { this.formReady = true; - this.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, data() { diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue index 0ffb4efe..0d179f90 100644 --- a/ayanova/src/components/custom-fields-control.vue +++ b/ayanova/src/components/custom-fields-control.vue @@ -170,7 +170,7 @@ export default { beforeCreate() { // console.log("custom-fields-control::BEFORECREATE: TOP"); //check pre-requisites exist just in case - if (this.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { if (!window.$gz._) { throw "custom-fields-control: $gz._ (lodash) is required and missing"; } @@ -185,7 +185,7 @@ export default { }, created() { // console.log("custom-fields-control::BEFORECREATE: TOP"); - if (this.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { //debugger; if (!this.formKey) { throw "custom-fields-control: formKey property is required and missing"; diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue index 93a36fd8..b014b72d 100644 --- a/ayanova/src/components/date-time-control.vue +++ b/ayanova/src/components/date-time-control.vue @@ -59,7 +59,7 @@ export default { beforeCreate() { //debugger; //check pre-requisites exist just in case - if (this.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { if (!window.$gz.dayjs) { throw "DateTimeControl: the DayJS library is required and missing"; } diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue index 938dae78..084f7b43 100644 --- a/ayanova/src/components/inventorywidgetlist.vue +++ b/ayanova/src/components/inventorywidgetlist.vue @@ -146,7 +146,7 @@ export default { }) .catch(err => { that.formState.ready = true; //show the form anyway so we know what's what - that.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, data() { diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue index 4a852783..c35f132d 100644 --- a/ayanova/src/components/tag-picker.vue +++ b/ayanova/src/components/tag-picker.vue @@ -73,7 +73,7 @@ export default { vm.tagSearchUnderway = false; }) .catch(err => { - vm.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, value(val) { @@ -103,7 +103,7 @@ export default { }, beforeCreate() { //check pre-requisites exist just in case - if (this.$gzdevmode()) { + if (window.$gz.errorHandler.devMode()) { if (!window.$gz._) { throw "tag-picker: $gz._ (lodash) is required and missing"; } diff --git a/ayanova/src/main.js b/ayanova/src/main.js index 659d0412..756480fb 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -71,16 +71,16 @@ window.$gz = { //Object.defineProperty(Vue.prototype, "$gzlocale", { value: locale }); //Object.defineProperty(Vue.prototype, "$gzapi", { value: gzapi }); //Object.defineProperty(Vue.prototype, "$gzform", { value: gzform }); -Object.defineProperty(Vue.prototype, "$gzformcustomtemplate", { - value: gzformcustomtemplate -}); -Object.defineProperty(Vue.prototype, "$gzreport", { value: gzreport }); -Object.defineProperty(Vue.prototype, "$gzHandleFormError", { - value: errorHandler.handleFormError -}); -Object.defineProperty(Vue.prototype, "$gzdevmode", { - value: errorHandler.devMode -}); +// Object.defineProperty(Vue.prototype, "$gzformcustomtemplate", { +// value: gzformcustomtemplate +// }); +// Object.defineProperty(Vue.prototype, "$gzreport", { value: gzreport }); +// Object.defineProperty(Vue.prototype, "$gzHandleFormError", { +// value: errorHandler.handleFormError +// }); +// Object.defineProperty(Vue.prototype, "$gzdevmode", { +// value: errorHandler.devMode +// }); ///////////////////////////////////////////////////////////////// // ERROR HANDLING diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue index c2c2288f..4c14f894 100644 --- a/ayanova/src/views/About.vue +++ b/ayanova/src/views/About.vue @@ -227,7 +227,7 @@ export default { }) .catch(err => { vm.formState.ready = true; - vm.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, created() { diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index 8a75d360..51232c25 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -254,7 +254,7 @@ export default { }) .catch(err => { vm.formState.ready = true; - vm.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, created() { @@ -446,7 +446,7 @@ export default { vm: vm, loading: false }); - vm.$gzHandleFormError(error, vm); + window.$gz.errorHandler.handleFormError(error, vm); }); }, submit() { @@ -491,7 +491,7 @@ export default { }) .catch(function handleSubmitError(error) { vm.formState.loading = false; - vm.$gzHandleFormError(error, vm); + window.$gz.errorHandler.handleFormError(error, vm); }); } }, @@ -531,7 +531,7 @@ export default { vm: vm, loading: false }); - vm.$gzHandleFormError(error, vm); + window.$gz.errorHandler.handleFormError(error, vm); }); } } @@ -565,7 +565,7 @@ export default { }) .catch(function handleDuplicateError(error) { vm.formState.loading = false; - vm.$gzHandleFormError(error, vm); + window.$gz.errorHandler.handleFormError(error, vm); }); } } @@ -592,7 +592,7 @@ function clickHandler(menuItem) { m.vm.duplicate(); break; case "report": - var reportList = m.vm.$gzreport.availableReports("WIDGET"); + var reportList = window.$gz.report.availableReports("WIDGET"); var selectedItem = reportList[0].value; window.$gz.dialog .getReportChoice(m.vm, reportList, selectedItem) diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue index c41d53fc..0bf8490c 100644 --- a/ayanova/src/views/inventory.vue +++ b/ayanova/src/views/inventory.vue @@ -56,7 +56,7 @@ export default { .then(() => (this.formState.ready = true)) .catch(err => { this.formState.ready = true; - this.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, created() { diff --git a/ayanova/src/views/log.vue b/ayanova/src/views/log.vue index fbfbfa12..a0df2183 100644 --- a/ayanova/src/views/log.vue +++ b/ayanova/src/views/log.vue @@ -50,7 +50,7 @@ export default { .then(() => (this.formState.ready = true)) .catch(err => { this.formState.ready = true; - this.$gzHandleFormError(err); + window.$gz.errorHandler.handleFormError(err); }); }, data() {