This commit is contained in:
Thomas Sileo 2018-05-29 22:16:09 +02:00
parent 48ab7137ab
commit a148ec6068
2 changed files with 3 additions and 2 deletions

View file

@ -25,3 +25,4 @@ script:
- python -m pytest -v --ignore data -k integration - python -m pytest -v --ignore data -k integration
# Federation tests (with two local instances) # Federation tests (with two local instances)
- python -m pytest -v -s --ignore data -k federation - python -m pytest -v -s --ignore data -k federation
- docker logs instance1_web_1

4
app.py
View file

@ -69,7 +69,7 @@ app.secret_key = get_secret_key('flask')
app.config.update( app.config.update(
WTF_CSRF_CHECK_DEFAULT=False, WTF_CSRF_CHECK_DEFAULT=False,
) )
csrf = CSRFProtect(app) # csrf = CSRFProtect(app)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -668,7 +668,7 @@ def api_user_key():
def _user_api_get_note(): def _user_api_get_note():
if request.is_json(): if request.is_json:
oid = request.json.get('id') oid = request.json.get('id')
else: else:
oid = request.args.get('id') or request.form.get('id') oid = request.args.get('id') or request.form.get('id')