refactoring cookie age as a function not a constant

1 files changed, 5 insertions, 3 deletions

diff --git a/core/views/other.py b/core/views/other.py
index 6d1b175..fd1d1ef 100644
--- a/core/views/other.py
+++ b/core/views/other.py
@@ -11,7 +11,7 @@ from troggle.core.models.logbooks import LogbookEntry, writelogbook  # , PersonL
 
 # from databaseReset import reinit_db # don't do this. databaseRest runs code *at import time*
 from troggle.core.models.troggle import Expedition
-from troggle.core.utils import current_expo, COOKIE_MAX_AGE
+from troggle.core.utils import current_expo, COOKIE_SHORT_TIMEOUT
 from troggle.parsers.imports import (
     import_caves,
     import_drawingsfiles,
@@ -38,9 +38,11 @@ todo = """
 
 def public_laptop(request):
     """Just sets a cookie. Visit this web page from Crowley, Anathema, Aziraphale, Pulsifer etc.
+    
+    This hack to be replaced in due course by a proper call from a user saying whether they are using a shared machine or not.
     """
-    response = HttpResponse("Cookie has been set on this machine, which now defines it as a public laptop. So login cookie lifetimes will now be short.")
-    response.set_cookie("public_laptop", "this is a public laptop", max_age=COOKIE_MAX_AGE)  # Cookie expires in 1 hour
+    response = HttpResponse(f"Cookie has been set on this machine, which now defines it as a public laptop. So the login cookie lifetimes will now be short:{COOKIE_SHORT_TIMEOUT/(60*60)} hour(s)")
+    response.set_cookie("public_laptop", "this is a public laptop", max_age=COOKIE_SHORT_TIMEOUT)  # Cookie expires in 1 hour
     return response
 
 def todos(request, module):