gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 14:08:06 +08:00
Code

fix: 解决快照列表排序的问题 (#6816)

Browse Source 
Refs #6810
This commit is contained in:
ssongliu 2024-10-23 10:46:17 +08:00 committed by ssongliu
parent 8a6ba5c007
commit 26b47bae69
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/dto/setting.go
View File

@ -149,7 +149,7 @@ type SnapshotInfo struct {
DefaultDownload string `json:"defaultDownload"` DefaultDownload string `json:"defaultDownload"`
Status string `json:"status"` Status string `json:"status"`
Message string `json:"message"` Message string `json:"message"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"created_at"`
Version string `json:"version"` Version string `json:"version"`
InterruptStep string `json:"interruptStep"` InterruptStep string `json:"interruptStep"`

10
backend/app/service/cronjob_backup.go
View File

@ -1,6 +1,7 @@
package service package service
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path" "path"
@ -30,6 +31,9 @@ func (u *CronjobService) handleApp(cronjob model.Cronjob, startTime time.Time) e
if err != nil { if err != nil {
return err return err
} }
if len(appItems) == 0 {
return errors.New("no such app in database!")
}
apps = appItems apps = appItems
} }
accountMap, err := loadClientMap(cronjob.BackupAccounts) accountMap, err := loadClientMap(cronjob.BackupAccounts)
@ -65,6 +69,9 @@ func (u *CronjobService) handleApp(cronjob model.Cronjob, startTime time.Time) e
func (u *CronjobService) handleWebsite(cronjob model.Cronjob, startTime time.Time) error { func (u *CronjobService) handleWebsite(cronjob model.Cronjob, startTime time.Time) error {
webs := loadWebsForJob(cronjob) webs := loadWebsForJob(cronjob)
if len(webs) == 0 {
return errors.New("no such website in database!")
}
accountMap, err := loadClientMap(cronjob.BackupAccounts) accountMap, err := loadClientMap(cronjob.BackupAccounts)
if err != nil { if err != nil {
return err return err
@ -98,6 +105,9 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, startTime time.Tim
func (u *CronjobService) handleDatabase(cronjob model.Cronjob, startTime time.Time) error { func (u *CronjobService) handleDatabase(cronjob model.Cronjob, startTime time.Time) error {
dbs := loadDbsForJob(cronjob) dbs := loadDbsForJob(cronjob)
if len(dbs) == 0 {
return errors.New("no such db in database!")
}
accountMap, err := loadClientMap(cronjob.BackupAccounts) accountMap, err := loadClientMap(cronjob.BackupAccounts)
if err != nil { if err != nil {
return err return err

2
frontend/src/api/interface/setting.ts
View File

@ -135,7 +135,7 @@ export namespace Setting {
description: string; description: string;
status: string; status: string;
message: string; message: string;
createdAt: DateTimeFormats; created_at: DateTimeFormats;
version: string; version: string;
interruptStep: string; interruptStep: string;
recoverStatus: string; recoverStatus: string;

2
frontend/src/views/setting/snapshot/index.vue
View File

@ -110,7 +110,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createdAt" prop="created_at"
sortable sortable
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFormat" :formatter="dateFormat"