From ef6e504e2098577e108f7c27d8832a4c6667d0cf Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 15 Jun 2020 19:43:52 +0000 Subject: [PATCH] --- ayanova/src/views/adm-license.vue | 70 ++++++++++++++++++------------- 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue index f6751188..9eea8096 100644 --- a/ayanova/src/views/adm-license.vue +++ b/ayanova/src/views/adm-license.vue @@ -229,6 +229,7 @@ export default { translations: [] }, licenseState: 0, + dbIsEmpty: false, request: { Email: null, Company: null, @@ -333,23 +334,25 @@ export default { async sendEvaluationRequest() { let vm = this; try { - //Only no key or expired trial are here, not expired purchase - //so safe to erase - let dialogResult = await window.$gz.dialog.confirmGeneric( - "AdminEraseDatabaseWarning", - "warning" - ); - if (dialogResult == false) { - return; + if (this.dbIsEmpty != true) { + //Need to erase database + let dialogResult = await window.$gz.dialog.confirmGeneric( + "AdminEraseDatabaseWarning", + "warning" + ); + if (dialogResult == false) { + return; + } + + dialogResult = await window.$gz.dialog.confirmGeneric( + "AdminEraseDatabaseLastWarning", + "error" + ); + if (dialogResult == false) { + return; + } } - dialogResult = await window.$gz.dialog.confirmGeneric( - "AdminEraseDatabaseLastWarning", - "error" - ); - if (dialogResult == false) { - return; - } //call erase let r = await window.$gz.api.upsertEx( "license/permanently-erase-all-data", @@ -410,23 +413,25 @@ export default { }, async erase() { let vm = this; + try { - let dialogResult = await window.$gz.dialog.confirmGeneric( - "AdminEraseDatabaseWarning", - "warning" - ); - if (dialogResult == false) { - return; - } + if (this.dbIsEmpty != true) { + let dialogResult = await window.$gz.dialog.confirmGeneric( + "AdminEraseDatabaseWarning", + "warning" + ); + if (dialogResult == false) { + return; + } - dialogResult = await window.$gz.dialog.confirmGeneric( - "AdminEraseDatabaseLastWarning", - "error" - ); - if (dialogResult == false) { - return; + dialogResult = await window.$gz.dialog.confirmGeneric( + "AdminEraseDatabaseLastWarning", + "error" + ); + if (dialogResult == false) { + return; + } } - //call erase let r = await window.$gz.api.upsertEx( "license/permanently-erase-all-data", @@ -530,6 +535,13 @@ function initForm(vm) { } vm.currentLicenseInfo = res.data.license; + await fetchTranslatedText(vm); + res = await window.$gz.api.get("license/database-empty"); + if (res.error) { + throw res.error; + } + vm.dbIsEmpty = res.data; + // await populateSelectionLists(vm); } catch (err) { reject(err);