From 28e8138907288592970639cf74eea6eea0e2d757 Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Tue, 23 May 2017 22:08:25 +0200
Subject: [PATCH] bug fix for changelog
---
edit.py | 4 ++--
server.py | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/edit.py b/edit.py
index 1634811..87659ed 100644
--- a/edit.py
+++ b/edit.py
@@ -41,8 +41,8 @@ editable_tables = {
'duration': {'type': 'duration'},
'jumplist': {'type': ''},
'deleted': {'type': 'boolean'},
- 'live': {'type': 'boolean', 'description': 'Ist ein Livestream geplant?'},
- 'norecording': {'type': 'boolean', 'description:', 'Führt dazu, dass der Termin ausgegraut wird.'}},
+ 'live': {'type': 'boolean', 'description': 'Ist ein Livestream geplant? Muss gesetzt sein damit der RTMP Stream zugeordnet wird.'},
+ 'norecording': {'type': 'boolean', 'description:': 'Führt dazu, dass der Termin ausgegraut wird.'}},
'creationtime_fields': ['course_id', 'time_created', 'time_updated'] },
'videos': {
'table': 'videos_data',
diff --git a/server.py b/server.py
index 1631071..f14e2d9 100644
--- a/server.py
+++ b/server.py
@@ -136,7 +136,10 @@ def evalperm(perms):
@app.template_filter()
def base64encode(str):
- return base64.b64encode(str.encode('UTF-8')).decode('UTF-8')
+ try:
+ return base64.b64encode(str.encode('UTF-8')).decode('UTF-8')
+ except:
+ return ''
@app.template_filter()
def checkperm(perms, username=None, password=None):
--
GitLab