diff --git a/backend/app/dto/container.go b/backend/app/dto/container.go index 0ead8b5a5..90a351768 100644 --- a/backend/app/dto/container.go +++ b/backend/app/dto/container.go @@ -8,7 +8,7 @@ type PageContainer struct { PageInfo Name string `json:"name"` State string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"` - OrderBy string `json:"orderBy" validate:"required,oneof=name status created_at"` + OrderBy string `json:"orderBy" validate:"required,oneof=name state created_at"` Order string `json:"order" validate:"required,oneof=null ascending descending"` Filters string `json:"filters"` ExcludeAppStore bool `json:"excludeAppStore"` diff --git a/backend/app/service/snapshot_recover.go b/backend/app/service/snapshot_recover.go index bfb2320e2..d559c0843 100644 --- a/backend/app/service/snapshot_recover.go +++ b/backend/app/service/snapshot_recover.go @@ -74,7 +74,7 @@ func (u *SnapshotService) HandleSnapshotRecover(snap model.Snapshot, isRecover b req.IsNew = true } if isRecover && (req.IsNew || snap.InterruptStep == "AppData") { - if err := recoverAppData(snapFileDir); err == nil { + if err := recoverAppData(snapFileDir); err != nil { updateRecoverStatus(snap.ID, isRecover, "DockerDir", constant.StatusFailed, fmt.Sprintf("handle recover app data failed, err: %v", err)) return }