From 7f58033e7f4b52d5815ae6a3e28961fedc6884dc Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Thu, 30 Jun 2022 15:59:48 +0200
Subject: [PATCH] =?UTF-8?q?dans=20voir=5Fgamuform=20:=20on=20peut=20passer?=
 =?UTF-8?q?=20dans=20l'url=20un=20arg=20&w=3Did=5Fmon=5Fobjet=3D25=20via?=
 =?UTF-8?q?=20parametre=5Furl=20ex=20:=20`|parametre=5Furl{w,id=5Fapp=5Fco?=
 =?UTF-8?q?mpetition=3D#ID=5FAPP=5FCOMPETITION}`=20cet=20arg=20sera=20ajou?=
 =?UTF-8?q?t=C3=A9=20dans=20le=20where=20de=20la=20recup=20des=20valeurs?=
 =?UTF-8?q?=20a=20afficher=20cela=20permet=20de=20faire=20un=20premier=20f?=
 =?UTF-8?q?iltrage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamuform_fonctions.php     | 9 +++++++--
 inclure/voir_gamuform.html | 6 +++---
 json_gamuform.json.html    | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gamuform_fonctions.php b/gamuform_fonctions.php
index 073856d..d9581a5 100644
--- a/gamuform_fonctions.php
+++ b/gamuform_fonctions.php
@@ -290,7 +290,7 @@ function gamuform_recup_classes(string $objet):array {
  *
  * @return array
  */
-function gamuform_recup_valeurs($objet, $id_objet = 0):array {
+function gamuform_recup_valeurs($objet, $id_objet = 0, $where = null):array {
 	$r = [];
 	if (gamuform_objet_autoriser($objet)) {
 		$table = table_objet_sql($objet);
@@ -305,7 +305,12 @@ function gamuform_recup_valeurs($objet, $id_objet = 0):array {
 				$r[0] = $valeurs;
 			}
 		} else {
-			$T = sql_allfetsel('*', $table, 1);
+			if ($where) {
+				$w[] = $where;
+			} else {
+				$w = 1;
+			}
+			$T = sql_allfetsel('*', $table, $w);
 			if (!empty($T)) {
 				foreach ($T as $t) {
 					$t['id'] = $t[$id];
diff --git a/inclure/voir_gamuform.html b/inclure/voir_gamuform.html
index cb618eb..4326f08 100644
--- a/inclure/voir_gamuform.html
+++ b/inclure/voir_gamuform.html
@@ -3,7 +3,6 @@
 <div class="conf-inner">
 	<h2 class="text-center">Configuration des [ (#ENV{objet}|gamuform_nom_objet)]</h2>
 	<div class="tableau">
-
 		[(#AUTORISER{creer, gamuform, 0, '', #ARRAY{objet, #ENV{objet}}}|oui)
 			[(#SET{lien,<a class="modalbox btn btn-gamuform"
 				href="[(#URL_PAGE{editer_gamuform}|parametre_url{objet,#ENV{objet}}|parametre_url{redirect,#SELF})]">
@@ -11,8 +10,9 @@
 					[(#ENV{objet}|gamuform_nom_objet{creer})]
 			</a>})]
 		]
-		#SET{url,spip.php?page=json_gamuform.json&objet=}
-		#SET{url,#GET{url}|concat{#ENV{objet}}}
+		#SET{url,spip.php?page=json_gamuform.json}
+		#SET{url,#GET{url}|parametre_url{objet,#ENV{objet}}}
+		#SET{url,#GET{url}|parametre_url{w,#ENV{w}}}
 		#SET{namecsv,#ENV{objet}.csv}
 		#SET{tparpage,[15,25,50,'Tous']}
 		<INCLURE{fond=inclure/gamutable,
diff --git a/json_gamuform.json.html b/json_gamuform.json.html
index 9b7252a..f27fec1 100644
--- a/json_gamuform.json.html
+++ b/json_gamuform.json.html
@@ -40,7 +40,7 @@
 }
 <B_gamuform>
 ,
-<BOUCLE_gamuform(DATA){source table, #ENV{objet}|gamuform_recup_valeurs{#ENV{id}}}{','}>
+<BOUCLE_gamuform(DATA){source table, #ENV{objet}|gamuform_recup_valeurs{#ENV{id},#ENV{w}}}{','}>
 	#SET{ligne,#VALEUR}
 	[(#SET{edit, #MODELE{lien_editer_gamuform,ligne=#GET{ligne},env} })]
 	[(#SET{sup, #MODELE{lien_supprimer_gamuform,ligne=#GET{ligne},env} })]