This commit is contained in:
2020-07-24 22:24:33 +00:00
parent 7b8ba6562c
commit 0aa891cc2c
7 changed files with 43 additions and 33 deletions

View File

@@ -44,6 +44,8 @@ todo: backup notification: AY:Backup status:~SERVER~
fixup token with translated text and include link to backup status ops page fixup token with translated text and include link to backup status ops page
########################## ##########################
todo: User edit form role control is not working
todo: server state form is not getting dirtied when setting radio button, only on text (try going to closed then open and not change text on open)
todo: ops backup file list not in order by date, seems to be random or something, I want newest at top oldest at bottom todo: ops backup file list not in order by date, seems to be random or something, I want newest at top oldest at bottom
todo: any use of simple-table sb turned into data-table see how it's done in ops-notify-queue, pretty straightforward and you get responsiveness and sorting built in todo: any use of simple-table sb turned into data-table see how it's done in ops-notify-queue, pretty straightforward and you get responsiveness and sorting built in
todo: go over server logging and rethink it a bit, levels maybe need adjusting, more debug and less trace todo: go over server logging and rethink it a bit, levels maybe need adjusting, more debug and less trace

View File

@@ -60,7 +60,7 @@
<v-col cols="12"> <v-col cols="12">
<v-btn <v-btn
:href="purchaseLink()" :href="purchaseLink()"
target="blank" target="_blank"
class="mt-4 mr-4" class="mt-4 mr-4"
>{{ $ay.t("PurchaseLicense") }}</v-btn >{{ $ay.t("PurchaseLicense") }}</v-btn
> >
@@ -157,7 +157,7 @@
<v-col cols="12"> <v-col cols="12">
<v-btn <v-btn
:href="purchaseLink()" :href="purchaseLink()"
target="blank" target="_blank"
class="mt-4 mr-4" class="mt-4 mr-4"
>{{ $ay.t("PurchaseLicense") }}</v-btn >{{ $ay.t("PurchaseLicense") }}</v-btn
> >

View File

@@ -663,7 +663,7 @@ function generateMenu(vm) {
title: "Export", title: "Export",
icon: "fa-file-download", icon: "fa-file-download",
href: href, href: href,
target: "blank", target: "_blank",
key: FORM_KEY + ":export", key: FORM_KEY + ":export",
vm: vm vm: vm
}); });

View File

@@ -211,7 +211,7 @@ function generateMenu(vm) {
title: "HelpTechSupport", title: "HelpTechSupport",
icon: "fa-life-ring", icon: "fa-life-ring",
href: window.$gz.menu.contactSupportUrl(), href: window.$gz.menu.contactSupportUrl(),
target: "blank", target: "_blank",
key: "about:contact" key: "about:contact"
} }
] ]

View File

@@ -12,7 +12,7 @@
<v-btn @click="helpEvaluate()" class="my-8 mr-16">{{ <v-btn @click="helpEvaluate()" class="my-8 mr-16">{{
$ay.t("EvaluationGuide") $ay.t("EvaluationGuide")
}}</v-btn> }}</v-btn>
<v-btn :href="supportLink()" target="blank" class="my-8 mr-12">{{ <v-btn :href="supportLink()" target="_blank" class="my-8 mr-12">{{
$ay.t("HelpTechSupport") $ay.t("HelpTechSupport")
}}</v-btn> }}</v-btn>
</v-col> </v-col>

View File

@@ -61,35 +61,26 @@
<v-col cols="12" class="mt-6"> <v-col cols="12" class="mt-6">
<v-col cols="12" lg="4"> <v-col cols="12" lg="4">
<span class="title">{{ $ay.t("BackupFiles") }}</span> <span class="title">{{ $ay.t("BackupFiles") }}</span>
<v-btn @click="getBackupStatus" class="ml-3"> <v-btn @click="getBackupStatus" class="mb-6">
<v-icon>fa-sync</v-icon> <v-icon>fa-sync</v-icon>
</v-btn> </v-btn>
<v-simple-table> <v-data-table
<template v-slot:default> :headers="headers"
<thead> :items="backupFileList"
<tr> class="elevation-1"
<th class="text-left">{{ $ay.t("FileName") }}</th> :disable-pagination="true"
<th class="text-left">{{ $ay.t("FileDate") }}</th> :disable-filtering="true"
<th class="text-left">{{ $ay.t("FileSize") }}</th> hide-default-footer
</tr> >
</thead> <template v-slot:item.actions="{ item }">
<tbody> <v-btn icon :href="item.url" >
<tr v-for="item in backupFileList" :key="item.id"> <v-icon small class="mr-2">
<td> fa-file-download
<template v-if="!formState.readOnly"> </v-icon>
<a :href="item.url">{{ item.name }}</a> </v-btn>
</template> </template></v-data-table
<template v-else> >
{{ item.name }}
</template>
</td>
<td>{{ item.created }}</td>
<td>{{ item.length }}</td>
</tr>
</tbody>
</template>
</v-simple-table>
<div class="mt-6"> <div class="mt-6">
({{ $ay.t("AvailableSpace") }}&nbsp;{{ backupAvailableSpace }}) ({{ $ay.t("AvailableSpace") }}&nbsp;{{ backupAvailableSpace }})
</div> </div>
@@ -145,6 +136,7 @@ export default {
formCustomTemplateKey: null, formCustomTemplateKey: null,
backupFileList: [], backupFileList: [],
backupAvailableSpace: null, backupAvailableSpace: null,
headers: [],
obj: { obj: {
id: 1, id: 1,
concurrency: 0, concurrency: 0,
@@ -412,6 +404,7 @@ function generateMenu(vm) {
// //
async function initForm(vm) { async function initForm(vm) {
await fetchTranslatedText(vm); await fetchTranslatedText(vm);
await createTableHeaders(vm);
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
@@ -433,4 +426,20 @@ async function fetchTranslatedText(vm) {
"AvailableSpace" "AvailableSpace"
]); ]);
} }
//////////////////////
//
//
async function createTableHeaders(vm) {
vm.headers = [
{
text: vm.$ay.t("FileName"),
align: "start",
value: "name"
},
{ text: vm.$ay.t("FileDate"), value: "created" },
{ text: vm.$ay.t("FileSize"), value: "length" },
{ text: "", value: "actions", sortable: false }
];
}
</script> </script>

View File

@@ -2,7 +2,7 @@
<v-row v-if="this.formState.ready"> <v-row v-if="this.formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col cols="12"> <v-col cols="12">
<v-btn @click="getDataFromApi"> <v-btn @click="getDataFromApi" class="mb-6">
<v-icon>fa-sync</v-icon> <v-icon>fa-sync</v-icon>
</v-btn> </v-btn>
@@ -20,7 +20,6 @@
</v-icon> </v-icon>
</template></v-data-table </template></v-data-table
> >
<!-- </v-col> -->
</v-col> </v-col>
</v-row> </v-row>
</template> </template>