diff --git a/backend/rest/backend.go b/backend/rest/backend.go index a50b23c7..b7fb5af8 100644 --- a/backend/rest/backend.go +++ b/backend/rest/backend.go @@ -211,8 +211,8 @@ func (b *Backend) BackupCreate(req *http.Request) (interface{}, error) { fmt.Printf("parse error: %v\n", err.Error()) return nil, errors.New("app is missing") } - _ = b.JobMaster.Offer("backup.create", func() error { return b.backup.Create(request.App) }) - return "submitted", nil + err = b.JobMaster.Offer("backup.create", func() error { return b.backup.Create(request.App) }) + return "submitted", err } func (b *Backend) BackupRestore(req *http.Request) (interface{}, error) { @@ -222,13 +222,13 @@ func (b *Backend) BackupRestore(req *http.Request) (interface{}, error) { fmt.Printf("parse error: %v\n", err.Error()) return nil, errors.New("file is missing") } - _ = b.JobMaster.Offer("backup.restore", func() error { return b.backup.Restore(request.File) }) - return "submitted", nil + err = b.JobMaster.Offer("backup.restore", func() error { return b.backup.Restore(request.File) }) + return "submitted", err } func (b *Backend) InstallerUpgrade(_ *http.Request) (interface{}, error) { - _ = b.JobMaster.Offer("installer.upgrade", func() error { return b.installer.Upgrade() }) - return "submitted", nil + err := b.JobMaster.Offer("installer.upgrade", func() error { return b.installer.Upgrade() }) + return "submitted", err } func (b *Backend) JobStatus(_ *http.Request) (interface{}, error) { diff --git a/www/src/views/App.vue b/www/src/views/App.vue index dbe62505..0512ac33 100644 --- a/www/src/views/App.vue +++ b/www/src/views/App.vue @@ -120,9 +120,8 @@ export default { info: undefined, appId: undefined, action: '', - loading: undefined, progress: true, - progressPercentage: 20, + progressPercentage: 0, progressSummary: '', progressIndeterminate: true, appActionConfirmationVisible: false, @@ -147,15 +146,15 @@ export default { this.progressSummary = '' this.progress = false }, - loadApp () { - return axios - .get('/rest/app', { params: { app_id: this.appId } }) - .then(resp => { - this.info = resp.data.data - }) - .catch(err => { - this.$refs.error.showAxios(err) - }) + async loadApp() { + try { + let resp = await axios + .get('/rest/app', {params: {app_id: this.appId}}) + this.info = resp.data.data + } catch (err) { + this.$refs.error.showAxios(err) + ; + } }, open () { window.location.href = this.info.app.url diff --git a/www/src/views/Backup.vue b/www/src/views/Backup.vue index 53f05758..47c1485c 100644 --- a/www/src/views/Backup.vue +++ b/www/src/views/Backup.vue @@ -4,26 +4,41 @@