From 4f9b7120531501155e9953df7cbd080eefdf2115 Mon Sep 17 00:00:00 2001 From: Christian Huff Date: Sun, 15 May 2016 22:23:24 +0100 Subject: [PATCH] Fix error occurring when attaching a file to a Task Extend the SQL storing the information to a file by username and creation date. --- db/files.go | 4 ++-- views/addViews.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/files.go b/db/files.go index 82a4f3f..90eaabe 100644 --- a/db/files.go +++ b/db/files.go @@ -11,8 +11,8 @@ import ( // AddFile is used to add the md5 of a file name which is uploaded to our application // this will enable us to randomize the URL without worrying about the file names -func AddFile(fileName, token string) error { - err := taskQuery("insert into files values(?,?)", fileName, token) +func AddFile(fileName, token, username string) error { + err := taskQuery("insert into files values(?,?,?,datetime())", fileName, token, username) return err } diff --git a/views/addViews.go b/views/addViews.go index f3b1250..c940e55 100644 --- a/views/addViews.go +++ b/views/addViews.go @@ -72,6 +72,7 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) { cookie, _ := r.Cookie("csrftoken") if formToken == cookie.Value { + username := sessions.GetCurrentUserName(r) if handler != nil { // this will be executed whenever a file is uploaded r.ParseMultipartForm(32 << 20) //defined maximum size of file @@ -95,13 +96,12 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) { } content = content + filelink - fileTruth := db.AddFile(handler.Filename, token) + fileTruth := db.AddFile(handler.Filename, token, username) if fileTruth != nil { message = "Error adding filename in db" log.Println("error adding task to db") } } - username := sessions.GetCurrentUserName(r) taskTruth := db.AddTask(title, content, category, taskPriority, username) if taskTruth != nil {