From 09edd30c7b3231cbf5d1c336487196448ac2f890 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Tue, 10 May 2022 18:06:27 +0200
Subject: [PATCH] on charge le formulaire avec id_redirect qui permet de de
 recharger la bonne ligne du gamutable

---
 formulaires/editer_gamuform.php | 12 ++++++------
 inclure/editer_gamuform.html    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/formulaires/editer_gamuform.php b/formulaires/editer_gamuform.php
index ebc6bad..75572e1 100644
--- a/formulaires/editer_gamuform.php
+++ b/formulaires/editer_gamuform.php
@@ -4,7 +4,7 @@ if (!defined('_ECRIRE_INC_VERSION')) {
 }
 
 
-function formulaires_editer_gamuform_saisies_dist($id_objet = 0, $objet = '', $options = [], $redirect = '') {
+function formulaires_editer_gamuform_saisies_dist($id_objet = 0, $objet = '', $options = [], $id_redirect = null, $redirect = '') {
 	$saisies = false;
 	if (gamuform_objet_autoriser($objet)) {
 		$saisies = gamuform_recup_tableau_objet($objet, false);
@@ -12,7 +12,7 @@ function formulaires_editer_gamuform_saisies_dist($id_objet = 0, $objet = '', $o
 	return $saisies;
 }
 
-function formulaires_editer_gamuform_charger_dist($id_objet = 0, $objet = '', $options = [], $redirect = '') {
+function formulaires_editer_gamuform_charger_dist($id_objet = 0, $objet = '', $options = [], $id_redirect = null, $redirect = '') {
 
 	$table = table_objet_sql($objet);
 	$id    = id_table_objet($objet);
@@ -29,7 +29,7 @@ function formulaires_editer_gamuform_charger_dist($id_objet = 0, $objet = '', $o
 	return $valeurs;
 }
 
-function formulaires_editer_gamuform_verifier_dist($id_objet = 0, $objet = '', $options = [], $redirect = '') {
+function formulaires_editer_gamuform_verifier_dist($id_objet = 0, $objet = '', $options = [], $id_redirect = null, $redirect = '') {
 
 	$erreurs = array();
 	if (!gamuform_objet_autoriser($objet)) {
@@ -38,7 +38,7 @@ function formulaires_editer_gamuform_verifier_dist($id_objet = 0, $objet = '', $
 	return $erreurs;
 }
 
-function formulaires_editer_gamuform_traiter_dist($id_objet = 0, $objet = '', $options = [], $redirect = '') {
+function formulaires_editer_gamuform_traiter_dist($id_objet = 0, $objet = '', $options = [], $id_redirect = null, $redirect = '') {
 
 	$saisies = gamuform_recup_tableau_objet($objet, false);
 	$table   = table_objet_sql($objet);
@@ -101,9 +101,9 @@ function formulaires_editer_gamuform_traiter_dist($id_objet = 0, $objet = '', $o
 	if ($redirect === 'gamutable') {
 		$retour['redirect'] = '';
 		if ($update) {
-			$retour['message_ok'] = gamutable_fermer_modalbox($id_objet);
+			$retour['message_ok'] = gamutable_fermer_modalbox($id_redirect ?? $id_objet);
 		} else {
-			$retour['message_ok'] = gamutable_fermer_modalbox();
+			$retour['message_ok'] = gamutable_fermer_modalbox($id_redirect ?? 0);
 		}
 	} else if ($redirect) {
 		$retour['redirect'] = $redirect;
diff --git a/inclure/editer_gamuform.html b/inclure/editer_gamuform.html
index 5846e78..f91f45f 100644
--- a/inclure/editer_gamuform.html
+++ b/inclure/editer_gamuform.html
@@ -6,6 +6,6 @@
 
 <div class="inner">
 	<div class="ajax">
-		[(#FORMULAIRE_EDITER_GAMUFORM{#ENV{id_objet}, #ENV{objet}, #GET{options}, #ENV{redirect}})]
+		[(#FORMULAIRE_EDITER_GAMUFORM{#ENV{id_objet}, #ENV{objet}, #GET{options}, #ENV{id_redirect}, #ENV{redirect}})]
 	</div>
 </div>