From 15297fa2f50c09da874ea7940efb3a83784d1593 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 5 Aug 2020 22:33:33 +0000
Subject: [PATCH]

---
 ayanova/src/components/gz-data-table.vue          | 8 ++++++--
 ayanova/src/views/adm-attachments.vue             | 4 +++-
 ayanova/src/views/adm-global-select-templates.vue | 3 ++-
 ayanova/src/views/home-notify-subscriptions.vue   | 1 +
 ayanova/src/views/home-search.vue                 | 4 +++-
 ayanova/src/views/home-user-settings.vue          | 4 +++-
 ayanova/src/views/ops-log.vue                     | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 71abb46a..9b71d409 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -840,7 +840,9 @@ async function populateSelectionLists(vm) {
     "data-list-view/viewlist?ListKey=" + vm.dataListKey
   );
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.listViews = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.listViews);
@@ -857,7 +859,9 @@ async function fetchListView(vm) {
   }
   let res = await window.$gz.api.get("data-list-view/" + vm.listViewId);
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    // window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.listView = res.data.listView;
   }
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 8e8d3365..04fe6462 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -357,7 +357,9 @@ async function fetchTranslatedText(vm) {
 async function populateSelectionLists(vm) {
   let res = await window.$gz.api.get("enum-list/list/Core");
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    // window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.objectTypes = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index c31105e2..50327b47 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -454,7 +454,8 @@ async function fetchTranslatedText(vm) {
 async function populateSelectionLists(vm) {
   let res = await window.$gz.api.get(API_BASE_URL + "List");
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
   } else {
     vm.selectLists.pickListTemplates = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates);
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 5fd21682..001f8e85 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-data-table
       :headers="headers"
       :items="obj"
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index 90c6be8b..a7e8831d 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -368,7 +368,9 @@ async function fetchTranslatedText(vm) {
 async function populateSelectionLists(vm) {
   let res = await window.$gz.api.get("enum-list/list/Core");
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    // window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.objectTypes = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 83e633f8..ccee346f 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -462,7 +462,9 @@ async function populateSelectionLists(vm) {
   //http://localhost:7575/api/v8/translation/list
   let res = await window.$gz.api.get("translation/list");
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.translations = res.data;
   }
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index 99c1083b..b7806d3c 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -210,7 +210,9 @@ async function fetchTranslatedText(vm) {
 async function populateSelectionLists(vm) {
   let res = await window.$gz.api.get("log-file");
   if (res.error) {
-    window.$gz.errorHandler.handleFormError(res.error, vm);
+    vm.formState.serverError = res.error;
+    window.$gz.form.setErrorBoxErrors(vm);
+    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.serverLogs = res.data;
   }