From 617513ead4c04dc442f6a130d578150170804522 Mon Sep 17 00:00:00 2001 From: jakobsn Date: Mon, 2 Dec 2019 16:20:30 +0100 Subject: [PATCH] finish --- src/app/static/stylesheet.css | 1 - src/app/templates/project.html | 2 +- src/app/views/app.py | 6 +++--- src/app/views/login.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/static/stylesheet.css b/src/app/static/stylesheet.css index 5fb7ea8..3f20308 100644 --- a/src/app/static/stylesheet.css +++ b/src/app/static/stylesheet.css @@ -45,7 +45,6 @@ img { } nav { - display: ; margin-bottom: 10px; } diff --git a/src/app/templates/project.html b/src/app/templates/project.html index 3c8284f..86e59fa 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) and (permissions[0] or project[5] == "open") and session.username: + $if len(project) and (permissions[0] or project[5] == "open" or session.userid == project[2]) and session.username:

Project: $project[3]

$if session.userid != project[2] and project[5] == "open": diff --git a/src/app/views/app.py b/src/app/views/app.py index f5028a7..6d4158e 100644 --- a/src/app/views/app.py +++ b/src/app/views/app.py @@ -30,6 +30,9 @@ app = web.application(urls, globals()) # Get html templates render = web.template.render('templates/') +# Set session timeout +web.config.session_parameters['timeout'] = None + # Workaround to use sessions with reloader (debugger) http://webpy.org/cookbook/session_with_reloader if web.config.get('_session') is None: session = web.session.Session(app, web.session.DiskStore("sessions"), initializer={"username": None}) @@ -37,9 +40,6 @@ if web.config.get('_session') is None: else: session = web.config._session -# Set session timeout -web.config.session_parameters['timeout'] = 12345678910 - # Add session to global variables render._add_global(session, 'session') diff --git a/src/app/views/login.py b/src/app/views/login.py index 5a0e3d9..d519bd5 100644 --- a/src/app/views/login.py +++ b/src/app/views/login.py @@ -57,7 +57,7 @@ class Login(): session.userid = userid if remember: rememberme = self.rememberme() - web.setcookie('remember', rememberme , 12000000) + web.setcookie('remember', rememberme , 30000000) def check_rememberme(self): """