diff --git a/projects/tentacles/src/python/tentacles/db.py b/projects/tentacles/src/python/tentacles/db.py index 6126c51..30f4547 100644 --- a/projects/tentacles/src/python/tentacles/db.py +++ b/projects/tentacles/src/python/tentacles/db.py @@ -173,8 +173,7 @@ class Db(Queries): digest.update(password.encode("utf-8")) res = super().try_login(username=username, hash=digest.hexdigest()) if not res: - res = self.fetch_user_status(sid=res.status_id) - raise LoginError(res.name) + return None return self.create_key(uid=res.id, name="web session", ttl=ttl) diff --git a/projects/tentacles/src/python/tentacles/templates/jobs_history.html.j2 b/projects/tentacles/src/python/tentacles/templates/jobs_history.html.j2 index 30060fe..cadc3c4 100644 --- a/projects/tentacles/src/python/tentacles/templates/jobs_history.html.j2 +++ b/projects/tentacles/src/python/tentacles/templates/jobs_history.html.j2 @@ -20,10 +20,12 @@ <label for="filename">File</label> <span name="filename">{{ctx.db.fetch_file(ctx.uid, job.file_id).filename or "it's a secret"}}</span> </div> + {% if job.finished_at and job.started_at %} <div class="job-runtime u-flex"> <label for="runtime">Runtime</label> <span name="Runtime">{{ (datetime.fromisoformat(job.finished_at) - datetime.fromisoformat(job.started_at)) }}</span> </div> + {% endif %} </div> <div class="controls u-flex u-ml-auto"> {% if ctx.uid %}