From e54e8147a85d433550fb06c0633f747c2b9d25e2 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 21 Aug 2021 13:40:47 +0200 Subject: [PATCH] =?UTF-8?q?Fix:=20retour=20apr=C3=A8s=20formulaire=20saisi?= =?UTF-8?q?e=20notes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_saisie_notes.py | 9 +++++++-- config.py | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py index 7411e7c4e..8f7209f24 100644 --- a/app/scodoc/sco_saisie_notes.py +++ b/app/scodoc/sco_saisie_notes.py @@ -1175,7 +1175,6 @@ def _form_saisie_notes(E, M, group_ids, destination="", REQUEST=None): ) ) # - breakpoint() H = [] if nb_decisions > 0: H.append( @@ -1193,11 +1192,17 @@ def _form_saisie_notes(E, M, group_ids, destination="", REQUEST=None): REQUEST.form, descr, initvalues=initvalues, - submitlabel="Terminer", + submitbutton=False, formid="formnotes", method="GET", ) H.append(tf.getform()) # check and init + H.append( + f"""Terminer + """ + ) if tf.canceled(): return None elif (not tf.submitted()) or not tf.result: diff --git a/config.py b/config.py index a86e65396..f854b7861 100755 --- a/config.py +++ b/config.py @@ -56,14 +56,16 @@ class DevConfig(Config): SQLALCHEMY_DATABASE_URI = ( os.environ.get("SCODOC_DEV_DATABASE_URI") or "postgresql:///SCODOC_DEV" ) + SECRET_KEY = os.environ.get("DEV_SECRET_KEY") or "bb3faec7d9a34eb68a8e3e710087d87a" class TestConfig(DevConfig): SQLALCHEMY_DATABASE_URI = ( os.environ.get("SCODOC_TEST_DATABASE_URI") or "postgresql:///SCODOC_TEST" ) - SERVER_NAME = "test.gr" + SERVER_NAME = os.environ.get("SCODOC_TEST_SERVER_NAME") or "test.gr" DEPT_TEST = "TEST_" # nom du département, ne pas l'utiliser pour un "vrai" + SECRET_KEY = os.environ.get("TEST_SECRET_KEY") or "c7ecff5db1594c208f573ff30e0f6bca" mode = os.environ.get("FLASK_ENV", "production")