From cad9fc18780133763f47a18e48eb45fe8d11a305 Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Wed, 27 Nov 2019 19:29:17 +0100
Subject: [PATCH] Backtrack to not being fked

---
 src/app/models/database.py     | 4 ++--
 src/app/templates/project.html | 7 +++----
 src/app/views/project.py       | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/models/database.py b/src/app/models/database.py
index 771bf4d..d3ef6df 100644
--- a/src/app/models/database.py
+++ b/src/app/models/database.py
@@ -3,8 +3,8 @@ import mysql.connector
 db = mysql.connector.connect(
     user='root', 
     password='root',
-    #host='10.5.0.5',   # Docker address
-    host='0.0.0.0',    # Local address
+    host='10.5.0.5',   # Docker address
+    #host='0.0.0.0',    # Local address
     database='db'
 )
     
\ No newline at end of file
diff --git a/src/app/templates/project.html b/src/app/templates/project.html
index d2fb6c4..254fe2f 100644
--- a/src/app/templates/project.html
+++ b/src/app/templates/project.html
@@ -34,11 +34,10 @@ $def with (nav, project, tasks, permissions)
                             <input type="file" name="myfile" />
                             <br/>
                             <input type="hidden" name="taskid" value="$task[0]"/>
-                            $if session.userid != project[2]:
-                                $if task[6] == "waiting for delivery" or task[6] == "declined":
+                            $if task[6] == "waiting for delivery" or task[6] == "declined":
                                     <input type="submit" name="submit"/>
-                                $if permissions[2]:
-                                    <button type="submit" name="deliver" value="1">Deliver</button>
+                            $if permissions[2]:
+                                <button type="submit" name="deliver" value="1">Deliver</button>
                             $if session.userid == project[2] and task[6] == "delivered":
                                     <button type="submit" name="acceped" value="1">Accept Delivery</button>
                                     <button type="submit" name="declined" value="1">Decline Delivery</button>
diff --git a/src/app/views/project.py b/src/app/views/project.py
index 82ddc73..7a01cec 100644
--- a/src/app/views/project.py
+++ b/src/app/views/project.py
@@ -50,7 +50,7 @@ class Project:
 
         print(data)
         # Test if the file was uploaded
-        if fileitem.filename and tasks[int(data.taskid)] == "waiting for delivery" or tasks[int(data.taskid)] == "declined":
+        if fileitem.filename:
             if not permissions[1]:
                 print("Permission denied")
                 raise web.seeother(('/project?projectid=' + data.projectid))