# HG changeset patch # User Dennis Fink # Date 2018-04-25 21:56:22 # Node ID 935466c16cae76336b3509452ad1b771562f2576 # Parent 935a6b927e50060edb9e3bbd64f2c588635fdb77 Bump version diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ packages.append('spaceapi.schema') setup( name='c3l_spaceapi', - version='0.0.13', + version='0.0.14', url=None, license='GPLv3+', author='Dennis Fink', diff --git a/spaceapi/templates/open.html b/spaceapi/templates/open.html --- a/spaceapi/templates/open.html +++ b/spaceapi/templates/open.html @@ -5,6 +5,7 @@
+
{% endblock %} diff --git a/spaceapi/utils.py b/spaceapi/utils.py --- a/spaceapi/utils.py +++ b/spaceapi/utils.py @@ -191,13 +191,14 @@ class ActiveStatus(Singleton, dict): del self['state']['message'] if trigger_person is None: - del self['state']['trigger_person'] + if 'trigger_person' in self['state']: + del self['state']['trigger_person'] else: self['state']['trigger_person'] = trigger_person self['state']['lastchange'] = int(time()) - if message is not None: + if message is not None and message: self['state']['message'] = message diff --git a/spaceapi/views.py b/spaceapi/views.py --- a/spaceapi/views.py +++ b/spaceapi/views.py @@ -59,8 +59,13 @@ def open(): elif 'open' in request.form: new_state = True - active.set_new_state(value=new_state, trigger_person=trigger_person) - activev14.set_new_state(value=new_state, trigger_person=trigger_person) + if 'message' in request.form: + message = request.form.get('message') + else: + message = None + + active.set_new_state(value=new_state, trigger_person=trigger_person, message=message) + activev14.set_new_state(value=new_state, trigger_person=trigger_person, message=message) active.save_last_state() activev14.save_last_state() return redirect(url_for('root.index'))