From e4501c05beee53f729bc9d96eb71e9eb7bb829cf Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Fri, 29 Nov 2019 17:08:29 +0100
Subject: [PATCH] bugfix

---
 src/app/static/stylesheet.css        |  8 ++++++++
 src/app/templates/open_projects.html |  2 +-
 src/app/templates/project.html       | 11 +++++++----
 src/app/views/project.py             |  6 +++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/static/stylesheet.css b/src/app/static/stylesheet.css
index b8efb54..f3c8e5a 100644
--- a/src/app/static/stylesheet.css
+++ b/src/app/static/stylesheet.css
@@ -113,3 +113,11 @@ nav ul {
 #project_meta {
     margin: auto;
 }
+
+div {
+    margin: auto;
+}
+
+form {
+    margin: auto;
+}
diff --git a/src/app/templates/open_projects.html b/src/app/templates/open_projects.html
index d321366..6589778 100644
--- a/src/app/templates/open_projects.html
+++ b/src/app/templates/open_projects.html
@@ -17,7 +17,7 @@ $def with (nav, categories, open_projects)
         $for category in categories:
             <div class="category" onclick="location.href='/open_projects?categoryid=$category[0]'">$category[1]</div>
     </div>
-
+    
     <div class="projects">
         $for project in open_projects:
             <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div>
diff --git a/src/app/templates/project.html b/src/app/templates/project.html
index 1587ddc..28d6864 100644
--- a/src/app/templates/project.html
+++ b/src/app/templates/project.html
@@ -12,7 +12,7 @@ $def with (nav, project_form, project, tasks, permissions, categories)
     
     $:nav
 
-    $if len(project):
+    $if len(project) and permissions[0]:
         <h1>Project: $project[3]</h1>
 
         $if project[5] == "open" and session.userid != project[2]:
@@ -38,8 +38,9 @@ $def with (nav, project_form, project, tasks, permissions, categories)
                             $project_form.taskid.set_value(task[0])
                             $:project_form.taskid.render()
                             $if (task[5] == "waiting for delivery" or task[5] == "declined"):
-                                $:project_form.myfile.render()
-                                $:project_form.submit.render()
+                                $if permissions[1]:
+                                    $:project_form.myfile.render()
+                                    $:project_form.submit.render()
                                 $if permissions[2]:
                                     $:project_form.deliver.render()
                             $if session.userid == project[2] and task[5] == "delivered":
@@ -48,5 +49,7 @@ $def with (nav, project_form, project, tasks, permissions, categories)
                         </form>
                 </li>
         </ul>
-  
+
+    $else:
+        <p>You do not have permissions to view this project</p>
 </body>
\ No newline at end of file
diff --git a/src/app/views/project.py b/src/app/views/project.py
index 6ee9134..23fc92e 100644
--- a/src/app/views/project.py
+++ b/src/app/views/project.py
@@ -25,7 +25,11 @@ class Project:
 
         data = web.input(projectid=0)
 
-        permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
+        try:
+            permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
+        except:
+            permissions = [0,0,0]
+
         categories = models.project.get_categories()
 
         if data.projectid: