diff --git a/app/scodoc/sco_inscr_passage.py b/app/scodoc/sco_inscr_passage.py index be1f58452e..4fb8c57acc 100644 --- a/app/scodoc/sco_inscr_passage.py +++ b/app/scodoc/sco_inscr_passage.py @@ -343,15 +343,19 @@ def formsemestre_inscr_passage( % inscrits[etudid] ) H.append("") - if not a_inscrire and not a_desinscrire: + todo = a_inscrire or a_desinscrire + if not todo: H.append("""

Il n'y a rien à modifier !

""") H.append( scu.confirm_dialog( - dest_url="formsemestre_inscr_passage", + dest_url="formsemestre_inscr_passage" + if todo + else "formsemestre_status", + message="

Confirmer ?

" if todo else "", add_headers=False, cancel_url="formsemestre_inscr_passage?formsemestre_id=" + str(formsemestre_id), - OK="Effectuer l'opération", + OK="Effectuer l'opération" if todo else "", parameters={ "formsemestre_id": formsemestre_id, "etuds": ",".join([str(x) for x in etuds]), diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index dbd353c6fc..705277025c 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -876,9 +876,10 @@ def confirm_dialog( H = [ f"""
{message} - """, ] + if OK or not cancel_url: + H.append(f'') if cancel_url: H.append( """