diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 95e4533c..6720f39f 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -11,6 +11,18 @@ todo: when server is in ops only mode the client needs a way to prevent people f I know the server will send a 404 or something but maybe that needs tweaking to show a proper message at the client or just not show those options or something? (part of long polling maybe??) + Widget list get this: + Unexpected error: {"code":"2001","message":"The server is closed for maintenance\r\ntest"} + + Users list get the users list no error, go to open one and get the error, inconsistent as hell + Customer users same thing + + What I'm seeing is some pages don't properly show error notice, i.e. translations just shows no data but in console you can see there was a 503 + + Main forms need the error control to be added and formstate and if you view a user record it *correctly* + displays the error message without linefeed characters so that needs to be replicated + + todo: OPEN OBJECT HANDLER Update it to check if a child type and if so then it calls get ancestor at server search route Search controller route: ancestor(ayatype, ayaid) returns type and id diff --git a/ayanova/src/api/errorhandler.js b/ayanova/src/api/errorhandler.js index 15de11ff..089f6827 100644 --- a/ayanova/src/api/errorhandler.js +++ b/ayanova/src/api/errorhandler.js @@ -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) { diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index 596a84a3..71abb46a 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -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; diff --git a/ayanova/src/main.js b/ayanova/src/main.js index 5aa47d94..8c82b438 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -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; //************************************************************ //************************************************************** //************************************************************** diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue index 29b5e0a2..641f4292 100644 --- a/ayanova/src/views/adm-global-settings.vue +++ b/ayanova/src/views/adm-global-settings.vue @@ -1,21 +1,26 @@