This commit is contained in:
2020-06-19 21:38:32 +00:00
parent 48d062c49b
commit bfcae2a750
15 changed files with 76 additions and 58 deletions

View File

@@ -562,14 +562,16 @@ function initForm(vm) {
try {
await fetchTranslatedText(vm);
let res = await window.$gz.api.get("license");
if (res.error) {
throw res.error;
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.currentLicenseInfo = res.data.license;
res = await window.$gz.api.get("license/database-empty");
if (res.error) {
throw res.error;
//We never expect there to be no data here
if (!res.data) {
throw res;
}
vm.dbIsEmpty = res.data;
} catch (err) {
@@ -614,18 +616,4 @@ function fetchTranslatedText(vm) {
"CopyDbId"
]);
}
// //////////////////////
// //
// //
// function populateSelectionLists(vm) {
// //http://localhost:7575/api/v8/translation/list
// return window.$gz.api.get("translation/list").then(res => {
// if (res.error) {
// window.$gz.errorHandler.handleFormError(res.error, vm);
// } else {
// vm.selectLists.translations = res.data;
// }
// });
// }
</script>

View File

@@ -302,8 +302,9 @@ function fetchTranslatedText(vm) {
//
function getServerInfo(vm) {
return window.$gz.api.get("server-info").then(res => {
if (res.error) {
throw res.error;
//We never expect there to be no data here
if (!res.data) {
throw res;
} else {
vm.serverInfo = res.data;
}

View File

@@ -163,8 +163,9 @@ export default {
try {
//Does the database need to be erased?
let res = await window.$gz.api.get("license/database-empty");
if (res.error) {
throw res.error;
//We never expect there to be no data here
if (!res.data) {
throw res;
}
if (res.data != true) {
let dialogResult = await window.$gz.dialog.confirmGeneric(

View File

@@ -221,9 +221,6 @@ export default {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Aya<span class="v-list-item__mask">Nov</span>
// <v-list-item-subtitle v-html="item.subtitle"></v-list-item-subtitle>
//subtitle: "<span class='text--primary'>to Alex, Scott, Jennifer</span> &mdash; Wish I could come, but I'm out of town this weekend.",
let showInfo = res.data;
let searchTerms = vm.searchPhrase
.toLocaleLowerCase()