diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js index f8ca6200..06ac6891 100644 --- a/ayanova/src/api/gzapi.js +++ b/ayanova/src/api/gzapi.js @@ -84,15 +84,23 @@ function handleError(action, error, route, reject) { error.message.includes("Network request failed") ) { window.$gz.store.commit("logItem", "Network error"); - window.$gz.eventBus.$emit( - "notify-error", - window.$gz.translation.get("ErrorServerUnresponsive") - ); + let msg = ""; + + if (window.$gz.store.state.authenticated) { + msg = window.$gz.translation.get("ErrorServerUnresponsive"); + } else { + msg = "Could not connect to AyaNova server "; + } + + msg += window.$gz.api.APIUrl("") + "\r\nError: " + error.message; + + window.$gz.eventBus.$emit("notify-error", msg); //note: using translation key in square brackets - return reject("[ErrorServerUnresponsive]"); + return reject(msg); //throw "Error: unable to contact server"; } } + //Ideally this should never get called because any issue should be addressed above devShowUnknownError(error); } @@ -306,6 +314,7 @@ export default { }) .catch(function handleGetError(error) { //fundamental error, can't proceed with this call + //license/trial handleError("GET", error, route, reject); }); }); diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index acdd236c..b19e5721 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -26,7 +26,7 @@ v-model="selectedTrialUserId" :items="selectLists.trialUsers" item-text="name" - item-value="id" + item-value="l" label="Trial mode example users" prepend-icon="fa-question-circle" @click:prepend="trialHelpClick" @@ -88,7 +88,7 @@