C3L-NOC/spaceapi Changeset - 935466c16cae · Chaos Computer Club Lëtzebuerg Projects

Changeset - 935466c16cae

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Dennis Fink - 7 years ago 2018-04-25 21:56:22
dennis.fink@c3l.lu

Bump version

4 files changed with 12 insertions and 5 deletions:

setup.py

spaceapi/templates/open.html

spaceapi/utils.py

spaceapi/views.py

0 comments (0 inline, 0 general)

setup.py

➞

Show inline comments

 from pprint import pprint
 from setuptools import setup, find_packages
 packages = find_packages()
 packages.append('spaceapi.templates')
 packages.append('spaceapi.static')
 packages.append('spaceapi.schema')
 setup(
     name='c3l_spaceapi',
-    version='0.0.13',
+    version='0.0.14',
     url=None,
     license='GPLv3+',
     author='Dennis Fink',
     author_email='dennis.fink@c3l.lu',
     description='spaceapi endpoint for c3l.lu',
     packages=packages,
     package_data={
         'spaceapi.templates': ['*'],
         'spaceapi.static': ['*'],
         'spaceapi.schema': ['*'],
     },
     install_requires=[

spaceapi/templates/open.html

➞

Show inline comments

 {% extends "base.html" %}
 {% block content %}
   <div class="text-center">
     <form method="POST" style="display: inline-block;">
       <input type="submit" name="open" value="open" class="btn btn-success btn-lg">
       <input type="submit" name="close" value="close" class="btn btn-danger btn-lg">
       <input type="text" name="message" class="form-control">
     </form>
   </div>
 {% endblock %}

spaceapi/utils.py

➞

Show inline comments

@@ @@ -182,31 +182,32 @@ class ActiveStatus(Singleton, dict): @@
             self['state']['open'] = value
             self.send_tweet(value)
             if not value:
                 if 'people_now_present' in self['sensors']:
                     self.clear_user_present()
                 if 'message' in self['state']:
                     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
 class ActiveStatusv14(ActiveStatus):
     def __init__(self):
         self.default_json_file = default_json_file_v14
         self.last_state_file = last_state_file_v14
     def send_tweet(self, value):
         pass

spaceapi/views.py

➞

Show inline comments

@@ @@ -50,26 +50,31 @@ def open(): @@
             if httpauth.username() in current_app.config['STATE_TRIGGER_PERSON_ALLOWED']:
                 trigger_person = httpauth.username()
             else:
                 trigger_person = None
         except KeyError:
             trigger_person = None
         if 'close' in request.form:
             new_state = False
         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'))
     return render_template('open.html')
 @root_views.route('/present', methods=('GET', 'POST'))
 @httpauth.login_required
 def present():
     if request.method == 'POST':

0 comments (0 inline, 0 general)