From 1e51eaa5eeefa6d0c1d4a0f6f838dbb28f28a24f Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Thu, 13 Oct 2016 22:29:40 +0200
Subject: [PATCH] closes #108

---
 server.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index 4c101f5..182f3cc 100644
--- a/server.py
+++ b/server.py
@@ -76,7 +76,7 @@ def csrf_protect(func):
 	def decorator(*args, **kwargs):
 		if '_csrf_token' in request.values:
 			token = request.values['_csrf_token']
-		elif '_csrf_token' in request.get_json():
+		elif request.get_json() and ('_csrf_token' in request.get_json()):
 			token = request.get_json()['_csrf_token']
 		else:
 			token = none
@@ -468,10 +468,12 @@ def create(table):
 		if column in tabs[table][3]:
 			columns.append(column)
 			values.append(val)
-	args = request.values
+	args = request.values.items()
 	if (request.method == 'POST') and (request.get_json()):
 		args = request.get_json().items()
+	print(args)
 	for column, val in args:
+		print(column,val)
 		if (column == 'ref') or (column == '_csrf_token'):
 			continue
 		assert column in tabs[table][2]+tabs[table][3]
@@ -593,5 +595,6 @@ import sorter
 if 'ICAL_URL' in config:
 	import meetings
 import l2pauth
-import jobs
+if 'JOBS_API_KEY' in config:
+	import jobs
 import timetable
-- 
GitLab