From f60a10d9ebb4806d701231a93cd4520437e70114 Mon Sep 17 00:00:00 2001
From: Johannes Brachem <37882800+jobrachem@users.noreply.github.com>
Date: Thu, 23 Jul 2020 16:11:42 +0200
Subject: [PATCH] Release v0.6.1 (#47)

* fix layout for inactive experiments

* fix logger in /experiment route


Co-authored-by: Johannes Brachem <jobrachem@posteo.de>
---
 CHANGELOG.md                            | 8 ++++++++
 src/mortimer/_version.py                | 2 +-
 src/mortimer/templates/experiment.html  | 6 ++++--
 src/mortimer/web_experiments/alfredo.py | 9 +++------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c5c03a..5655846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Mortimer v0.6.1 (Released 2020-07-23)
+
+### Fixed
+
+* Fixed a bug that prevented correct logging of exceptions occuring during experiment execution.
+
+* Fixed a bug that messed up the layout of the experiment page for inactive experiments.
+
 ## Mortimer v0.6.0 (Released 2020-07-13)
 
 ### Changed
diff --git a/src/mortimer/_version.py b/src/mortimer/_version.py
index 2539302..d60fb69 100644
--- a/src/mortimer/_version.py
+++ b/src/mortimer/_version.py
@@ -3,4 +3,4 @@
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/src/mortimer/templates/experiment.html b/src/mortimer/templates/experiment.html
index a3f38f1..c3b5664 100644
--- a/src/mortimer/templates/experiment.html
+++ b/src/mortimer/templates/experiment.html
@@ -4,10 +4,12 @@
 <div>
   <h1>{{ experiment.title }}</h1>
 
-  {% if experiment.active == True %}
-
   <div class="row">
     <div class="col">
+
+      {% if experiment.active == True %}
+
+
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <form method="POST"
diff --git a/src/mortimer/web_experiments/alfredo.py b/src/mortimer/web_experiments/alfredo.py
index eaba263..73ad076 100644
--- a/src/mortimer/web_experiments/alfredo.py
+++ b/src/mortimer/web_experiments/alfredo.py
@@ -269,14 +269,11 @@ def experiment():
             resp.cache_control.no_cache = True
             return resp
     except Exception:
-        log = alfredlog.QueuedLoggingInterface("alfred3", f"exp.{str(experiment.id)}")
+        log = alfredlog.QueuedLoggingInterface("alfred3", f"exp.{str(experiment.exp_id)}")
         log.session_id = sid
         log.exception("Exception during experiment execution.")
-        # raise e
-        # logger.critical(
-        #     msg=traceback.format_exc(), exp_id=str(experiment.exp_id), session_id=sid
-        # )
-        return render_template("errors/500_alfred.html")
+
+        abort(500)
 
 
 @alfredo.route("/staticfile/<identifier>")