This commit is contained in:
2019-07-19 19:57:41 +00:00
parent 5b94fd25e1
commit 43b955501a
12 changed files with 28 additions and 28 deletions

View File

@@ -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";

View File

@@ -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";

View File

@@ -26,7 +26,7 @@ export default {
.then(() => (this.formReady = true))
.catch(err => {
this.formReady = true;
this.$gzHandleFormError(err);
window.$gz.errorHandler.handleFormError(err);
});
},
data() {

View File

@@ -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";

View File

@@ -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";
}

View File

@@ -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() {

View File

@@ -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";
}

View File

@@ -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

View File

@@ -227,7 +227,7 @@ export default {
})
.catch(err => {
vm.formState.ready = true;
vm.$gzHandleFormError(err);
window.$gz.errorHandler.handleFormError(err);
});
},
created() {

View File

@@ -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)

View File

@@ -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() {

View File

@@ -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() {