mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-12-19 05:49:02 +08:00
feat: Optimize App Update Log Display (#10469)
This commit is contained in:
parent
4ebd4bddee
commit
0433a26a07
3 changed files with 20 additions and 20 deletions
|
|
@ -677,7 +677,6 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
|
|||
backupFile string
|
||||
)
|
||||
backUpApp := func(t *task.Task) error {
|
||||
if req.Backup {
|
||||
backupService := NewIBackupService()
|
||||
backupRecordService := NewIBackupRecordService()
|
||||
fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5))
|
||||
|
|
@ -696,10 +695,11 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
|
|||
} else {
|
||||
return buserr.WithNameAndErr("ErrAppBackup", install.Name, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if req.Backup {
|
||||
upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), backUpApp, nil)
|
||||
}
|
||||
|
||||
upgradeApp := func(t *task.Task) error {
|
||||
fileOp := files.NewFileOp()
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, er
|
|||
return nil, err
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
return record, nil
|
||||
}
|
||||
|
||||
func (u *BackupService) AppRecover(req dto.CommonRecover) error {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</template>
|
||||
<template #leftToolBar>
|
||||
<el-button @click="sync" type="primary" plain v-if="mode === 'installed' && data != null">
|
||||
{{ $t('commons.button.sync') }}
|
||||
{{ $t('commons.button.refresh') }}
|
||||
</el-button>
|
||||
<el-button @click="openIgnore" type="primary" plain v-if="mode === 'upgrade'">
|
||||
{{ $t('app.showIgnore') }}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue