This commit is contained in:
2020-08-05 19:03:20 +00:00
parent 6fdefd19a3
commit 6fddd981ed
8 changed files with 61 additions and 31 deletions

View File

@@ -35,24 +35,26 @@ function dealWithError(msg, vm) {
}
//If a form instance was provided (vue instance)
//then put the error into it
if (vm) {
if (vm.$ay.dev) {
//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";
}
}
vm.formState.appError = msg;
//TODO: What is this doing exactly?
//it's related to server errors but I'm setting appError above
//why two error properties?
window.$gz.form.setErrorBoxErrors(vm);
} else {
//and it can display and error then put the error into it
if (!vm || vm.formState == undefined) {
//popup if no place to display it elsewise
window.$gz.eventBus.$emit("notify-error", msg);
return;
}
//should be able to display in form...
if (vm.$ay.dev) {
//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";
}
}
vm.formState.appError = msg;
//TODO: What is this doing exactly?
//it's related to server errors but I'm setting appError above
//why two error properties?
window.$gz.form.setErrorBoxErrors(vm);
}
export default {
handleGeneralError(message, source, lineno, colno, error) {

View File

@@ -565,7 +565,9 @@ export default {
});
if (res.error) {
throw res.error;
// throw res.error;
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Save a copy of the server columns data for handling button clicks etc later
vm.serverColumns = res.columns;

View File

@@ -63,7 +63,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control
//DEVELOPMENT MODE
//THIS SHOULD BE FALSE IN RELEASE
//************************************************************
const DEV_MODE = true;
const DEV_MODE = false;
//************************************************************
//**************************************************************
//**************************************************************

View File

@@ -1,21 +1,26 @@
<template>
<v-card class="mx-auto" v-if="formState.ready">
<v-list subheader>
<v-subheader>{{ $ay.t("UserInterfaceSettings") }}</v-subheader>
<v-list-item
link
to="adm-global-select-templates"
:data-cy="!!$ay.dev ? 'picklisttemplates' : false"
>
<v-list-item-title>{{ $ay.t("PickListTemplates") }}</v-list-item-title>
</v-list-item>
<div>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-card class="mx-auto" v-if="formState.ready">
<v-list subheader>
<v-subheader>{{ $ay.t("UserInterfaceSettings") }}</v-subheader>
<v-list-item
link
to="adm-global-select-templates"
:data-cy="!!$ay.dev ? 'picklisttemplates' : false"
>
<v-list-item-title>{{
$ay.t("PickListTemplates")
}}</v-list-item-title>
</v-list-item>
<!-- <v-subheader>{{ $ay.t("Server") }}</v-subheader>
<!-- <v-subheader>{{ $ay.t("Server") }}</v-subheader>
<v-list-item>
<v-list-item-title>{{ $ay.t("Notifications") }}</v-list-item-title>
</v-list-item> -->
</v-list>
</v-card>
</v-list>
</v-card>
</div>
</template>
<script>
@@ -28,6 +33,13 @@ export default {
helpUrl: "form-adm-global-settings",
formData: {
ayaType: window.$gz.type.Global
},
formState: {
ready: false,
loading: true,
errorBoxMessage: null,
appError: null,
serverError: {}
}
});
},

View File

@@ -1,5 +1,6 @@
<template>
<div>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-data-table
v-model="selected"
:headers="headers"

View File

@@ -1,5 +1,6 @@
<template>
<div>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-data-table
v-model="selected"
:headers="headers"

View File

@@ -103,7 +103,7 @@ export default {
selectLists: {
trialUsers: [
{
name: "AyaNova administrator - all",
name: "AyaNova SuperUser - all",
l: "superuser",
p: "l3tm3in"
},