diff options
| author | Ollie Phillips <7113347+olliephillips@users.noreply.github.com> | 2019-08-01 16:48:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 16:48:22 +0100 |
| commit | f0472b990d7022e2022538d54286bd11ecfaa912 (patch) | |
| tree | 7928413f9d392e0fb2b683225dc6a7bcc5804ef6 /system/admin/handlers.go | |
| parent | 3ef2dc0da5d39686da48ac90e8a8a2c6b861e549 (diff) | |
| parent | 4beb78e420595eea405566741490b2aa2f5e1854 (diff) | |
Merge pull request #311 from ponzu-cms/ponzu-dev
Merging ponzu-dev to master as v0.11.0
Diffstat (limited to 'system/admin/handlers.go')
| -rw-r--r-- | system/admin/handlers.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/system/admin/handlers.go b/system/admin/handlers.go index d0818ec..8850f03 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -2200,7 +2200,18 @@ func deleteUploadHandler(res http.ResponseWriter, req *http.Request) { return } - err = db.DeleteUpload(t + ":" + id) + dbTarget := t + ":" + id + + // delete from file system, if good, we continue to delete + // from database, if bad error 500 + err = deleteUploadFromDisk(dbTarget) + if err != nil { + log.Println(err) + res.WriteHeader(http.StatusInternalServerError) + return + } + + err = db.DeleteUpload(dbTarget) if err != nil { log.Println(err) res.WriteHeader(http.StatusInternalServerError) |
