Merge pull request #56 from ctreffe/develop

Develop

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Mortimer v0.8.7 (Released 2021-05-14)
+
+### Fixed v0.8.7
+
+- Fixed subdirectory display (#54)
+- Inactive experiments are now in fact unavailable (#53)
+
 ## Mortimer v0.8.6 (Released 2021-05-14)
 
 ### Changed v0.8.6

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.8.6"
+__version__ = "0.8.7"

src/mortimer/templates/additional/display_dir_controls.html

@@ -18,7 +18,7 @@
     </p>
 
     <div class="collapse" id="NewDirectory_{{directory}}_{{call_id}}">
-        <form action="{{new_subdirectory_url}}" , method="POST">
+        <form action="{{new_subdirectory_url}}" method="POST">
             <div><input class="form-control form-control-lg mr-3 mb-3 mt-3" id="new_directory" name="new_directory"
                     required type="text" value="" placeholder="Name">
                 <input class="btn btn-outline-primary btn-sm" type="submit" value="Create">
@@ -33,7 +33,7 @@
     </div>
 
 
-    {{subdirectory_display}}
+    {{subdirectory_display|safe}}
 
 </div>
 

src/mortimer/templates/exp_inactive.html

@@ -0,0 +1,9 @@
+{% extends "skeleton.html" %}
+
+
+{% block layout %}
+<div class="jumbotron mt-5">
+        <h1>Experiment unavailable</h1>
+        <p>We are sorry to inform you that the experiment you wanted to visit is currently not available. Please try again later or contact the administrator.</p>
+</div>
+{% endblock %}

src/mortimer/web_experiments/alfredo.py

@@ -168,6 +168,9 @@ def start(expid):
             <input type="password" name="password" /><button type="submit">Submit</button></form></div>'
             % exp_url
         )
+
+    if not experiment.active:
+        return render_template("exp_inactive.html")
 
     # create session id
     sid = str(uuid4())