[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-bank] branch master updated: don't erroneously conflict on select
From: |
gnunet |
Subject: |
[taler-bank] branch master updated: don't erroneously conflict on selection |
Date: |
Wed, 05 Aug 2020 14:03:09 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 695b38f don't erroneously conflict on selection
695b38f is described below
commit 695b38fbd7e7d2843468b8560f4504416556b65f
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Wed Aug 5 17:32:42 2020 +0530
don't erroneously conflict on selection
---
bin/taler-bank-manage | 4 ++++
talerbank/app/views.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/taler-bank-manage b/bin/taler-bank-manage
index 348ee88..6e18cd1 100755
--- a/bin/taler-bank-manage
+++ b/bin/taler-bank-manage
@@ -80,6 +80,8 @@ def handle_serve_http(args):
params = ["uwsgi", "uwsgi",
"--static-map", "/static=%s/talerbank/app/static" %
SITE_PACKAGES,
"--die-on-term",
+ "--no-orphans",
+ "--master",
"--http", httpspec,
"--log-format", UWSGI_LOGFMT,
"--module", "talerbank.wsgi"]
@@ -102,6 +104,8 @@ def handle_serve_uwsgi(args):
params = ["uwsgi", "uwsgi",
"--static-map", "/static=%s/talerbank/app/static" %
SITE_PACKAGES,
"--die-on-term",
+ "--no-orphans",
+ "--master",
"--log-format", UWSGI_LOGFMT,
"--module", "talerbank.wsgi"]
if serve_uwsgi == "tcp":
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index 96e3518..0b25c3d 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -1035,13 +1035,13 @@ def api_withdraw_operation(request, withdraw_id):
selected_reserve_pub = data.get("reserve_pub")
if not isinstance(selected_reserve_pub, str):
return JsonResponse(dict(error="reserve_pub must be a string"),
status=400)
- if op.selection_done or op.confirmation_done:
+ if op.selection_done:
if (
op.selected_exchange_account != exchange_account
or op.selected_reserve_pub != selected_reserve_pub
):
return JsonResponse(
- dict(error="selection of withdraw parameters already
done"),
+ dict(code=5600, hint="selection of withdraw parameters
already done"),
status=409,
)
else:
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-bank] branch master updated: don't erroneously conflict on selection,
gnunet <=