This commit is contained in:
2020-06-14 22:06:57 +00:00
parent c47cd1a839
commit 9a28ec0665
3 changed files with 44 additions and 19 deletions

View File

@@ -6,11 +6,6 @@ WIFI change 5g channel to 52,56,60 and 2g channel to 8
recheck before doing as it seems to vary, maybe someone else's is auto switching
todo: ensure dbid on about page
No, showing empty for no license mode, wtf?
todo: about form show real dbid not license dbid or both I guess
todo: license form erase all data?
has to go somewhere, it's an ops thing kind of but also a biz thing so... hmm..

View File

@@ -326,11 +326,6 @@ export default {
if (licenseState == 4 || licenseState == 5) {
return "neednotrial";
}
// //LICENSE STATE: REVOKED
//nothing special for revoke
// if (licenseState == 5) {
// return "revoked";
// }
//LICENSE STATE: ActiveTrial or ActivePurchased
if (licenseState == 1 || licenseState == 3) {
@@ -417,6 +412,34 @@ export default {
window.$gz.errorHandler.handleFormError(error, vm);
}
},
async erase() {
let vm = this;
try {
let dialogResult = await window.$gz.dialog.confirmGeneric(
"AdminEraseDatabaseWarning"
);
if (dialogResult == false) {
return;
}
dialogResult = await window.$gz.dialog.confirmGeneric(
"AdminEraseDatabaseLastWarning"
);
if (dialogResult == false) {
return;
}
//call erase
let r = await window.$gz.api.upsertEx(
"license/permanently-erase-all-data",
"I understand"
);
vm.$router.push("/login");
} catch (error) {
window.$gz.errorHandler.handleFormError(error, vm);
}
},
translation() {
return window.$gz.translation;
},
@@ -446,6 +469,9 @@ function clickHandler(menuItem) {
case "fetch":
m.vm.fetchKey();
break;
case "erase":
m.vm.erase();
break;
default:
window.$gz.eventBus.$emit(
@@ -472,14 +498,6 @@ function generateMenu(vm) {
};
if (vm.rights.change) {
// menuOptions.menuItems.push({
// title: vm.$ay.t("Save"),
// icon: "fa-save",
// surface: true,
// key: FORM_KEY + ":save",
// vm: vm
// });
//Trigger license check
menuOptions.menuItems.push({
title: vm.$ay.t("CheckForLicense"),
@@ -487,6 +505,14 @@ function generateMenu(vm) {
key: FORM_KEY + ":fetch",
vm: vm
});
//erase database
menuOptions.menuItems.push({
title: vm.$ay.t("AdminEraseDatabase"),
icon: "fa-skull-crossbones",
key: FORM_KEY + ":erase",
vm: vm
});
}
window.$gz.eventBus.$emit("menu-change", menuOptions);
@@ -540,6 +566,8 @@ function fetchTranslatedText(vm) {
"LicenseEmailVerficationHint",
"EvaluationRequestReceived",
"AdminEraseDatabaseWarning",
"AdminEraseDatabase",
"AdminEraseDatabaseLastWarning",
"NewLicenseInstalled",
"NewLicenseNotFound",
"HelpReleaseKey",

View File

@@ -77,7 +77,9 @@
</div>
<div>
<span class="ml-6 body-1">{{ $ay.t("DatabaseID") }}: </span>
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
<span class="body-2">{{
serverInfo.license.license.serverDbId
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ $ay.t("LicenseSerial") }}: </span>