Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

fixed bugs 

send not absolute values in baruser
set lockedbar is not an array
This commit is contained in:
Tim Gröger 2020-05-11 23:07:26 +02:00
parent 987487d3c4
commit 3752026e22
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
geruecht/baruser/routes.py
View File

@ -84,7 +84,7 @@ def _baradd(**kwargs):
else: else:
type = 'amount' type = 'amount'
dic = user.toJSON() dic = user.toJSON()
dic['amount'] = abs(all) dic['amount'] = all
dic['type'] = type dic['type'] = type
debug.debug("return {{ {} }}".format(dic)) debug.debug("return {{ {} }}".format(dic))
creditL.info("{} Baruser {} {} fügt {} {} {} € Schulden hinzu.".format( creditL.info("{} Baruser {} {} fügt {} {} {} € Schulden hinzu.".format(
@ -147,7 +147,7 @@ def _storno(**kwargs):
else: else:
type = 'amount' type = 'amount'
dic = user.toJSON() dic = user.toJSON()
dic['amount'] = abs(all) dic['amount'] = all
dic['type'] = type dic['type'] = type
debug.debug("return {{ {} }}".format(dic)) debug.debug("return {{ {} }}".format(dic))
creditL.info("{} Baruser {} {} storniert {} € von {} {}".format( creditL.info("{} Baruser {} {} storniert {} € von {} {}".format(
@ -183,7 +183,7 @@ def _getUser(**kwargs):
@baruser.route("/search", methods=['GET']) @baruser.route("/search", methods=['GET'])
@login_required(groups=[BAR, MONEY, USER, VORSTAND]) @login_required(groups=[BAR, MONEY, USER, VORSTAND], bar=True)
def _search(**kwargs): def _search(**kwargs):
debug.info("/search") debug.info("/search")
try: try:
@ -198,12 +198,14 @@ def _search(**kwargs):
debug.debug("exception", exc_info=True) debug.debug("exception", exc_info=True)
return jsonify({"error": str(err)}), 500 return jsonify({"error": str(err)}), 500
@baruser.route("/bar/lock", methods=['POST']) @baruser.route("/bar/lock", methods=['GET', 'POST'])
@login_required(groups=[BAR], bar=True) @login_required(groups=[BAR], bar=True)
def _lockbar(**kwargs): def _lockbar(**kwargs):
debug.info('/bar/lock') debug.info('/bar/lock')
data = request.get_json()
accToken = kwargs['accToken'] accToken = kwargs['accToken']
accToken.lock_bar = [data['value']] if request.method == "POST":
data = request.get_json()
accToken.lock_bar = data['value']
debug.debug('return {{ "value": {} }}'.format(accToken.lock_bar)) debug.debug('return {{ "value": {} }}'.format(accToken.lock_bar))
return jsonify({'value': accToken.lock_bar}) return jsonify({'value': accToken.lock_bar})

2
geruecht/routes.py
View File

@ -19,7 +19,7 @@ def _valid(**kwargs):
try: try:
accToken = kwargs['accToken'] accToken = kwargs['accToken']
data = request.get_json() data = request.get_json()
userController.validateUser(accToken.user.username, data['password']) userController.validateUser(accToken.user.uid, data['password'])
debug.debug('return {{ "ok": "ok" }}') debug.debug('return {{ "ok": "ok" }}')
return jsonify({"ok": "ok"}) return jsonify({"ok": "ok"})
except Exception as err: except Exception as err: