From 1cd7544db0193ee414fbc8743c7af62b7d07ca67 Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Sun, 8 Mar 2020 23:34:32 +0100
Subject: [PATCH] =?UTF-8?q?on=20ajoute=20un=20param=C3=A8tre=20"type=20d'a?=
 =?UTF-8?q?rticle"=20=20pour=20g=C3=A9rer=20la=20redirection=20apr=C3=A8s?=
 =?UTF-8?q?=20une=20action=20AJAX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 action/promouvoir_photo.php      | 3 ++-
 action/supprimer_photo.php       | 3 ++-
 formulaires/editer_groupe.html   | 2 +-
 formulaires/editer_post.html     | 2 +-
 formulaires/editer_sujet.html    | 2 +-
 inclure/editer_docs_article.html | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/action/promouvoir_photo.php b/action/promouvoir_photo.php
index 642ea9d..4769a9e 100644
--- a/action/promouvoir_photo.php
+++ b/action/promouvoir_photo.php
@@ -8,6 +8,7 @@ function action_promouvoir_photo_dist(){
 	$Targs = explode('-', $arg);
 	$id_document = intval($Targs[0]);
 	$id_article = intval($Targs[1]);
+	$type = $Targs[2];
 	if (!$id_document OR !$id_article) 
 		return false;
 
@@ -35,7 +36,7 @@ function action_promouvoir_photo_dist(){
 	suivre_invalideur("id='id_article/$id_article'");
 
 	// redirection sur la page d'édition de l'article
-	$retour = 'spip.php?page=editer_article&id_article='.$id_article.'#les_photos';
+	$retour = "spip.php?page=editer_$type&id_article=$id_article#les_photos";
 	include_spip('inc/headers');
 	redirige_par_entete($retour);
 }
diff --git a/action/supprimer_photo.php b/action/supprimer_photo.php
index 7d15678..5db3abe 100644
--- a/action/supprimer_photo.php
+++ b/action/supprimer_photo.php
@@ -7,6 +7,7 @@ function action_supprimer_photo_dist(){
 	$Targs = explode('-', $arg);
 	$id_document = intval($Targs[0]);
 	$id_article = intval($Targs[1]);
+	$type = $Targs[2];
 
 
 	include_spip('inc/autoriser');
@@ -21,7 +22,7 @@ function action_supprimer_photo_dist(){
 	}
 
 	// redirection sur la page d'édition
-	$retour = 'spip.php?page=editer_article&id_article='.$id_article;
+	$retour = "spip.php?page=editer_$type&id_article=$id_article";
 	include_spip('inc/headers');
 	redirige_par_entete($retour);
 }
diff --git a/formulaires/editer_groupe.html b/formulaires/editer_groupe.html
index cca6ee2..661dc2d 100644
--- a/formulaires/editer_groupe.html
+++ b/formulaires/editer_groupe.html
@@ -105,7 +105,7 @@
 					<div class="ajax">
 						<INCLURE{fond=inclure/bigform,env}>
 					</div>
-					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos}>
+					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos,type=groupe}>
 				</fieldset>
 
 		[(#REM)
diff --git a/formulaires/editer_post.html b/formulaires/editer_post.html
index eb3f2e8..a56d073 100644
--- a/formulaires/editer_post.html
+++ b/formulaires/editer_post.html
@@ -83,7 +83,7 @@
 					<div class="ajax">
 						<INCLURE{fond=inclure/bigform,env}>
 					</div>
-					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos}>
+					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos,type=article}>
 				</fieldset>
 
 		[(#REM)
diff --git a/formulaires/editer_sujet.html b/formulaires/editer_sujet.html
index c9d14c4..dd38f5d 100644
--- a/formulaires/editer_sujet.html
+++ b/formulaires/editer_sujet.html
@@ -29,7 +29,7 @@
 					<div class="ajax">
 						<INCLURE{fond=inclure/bigform,env}>
 					</div>
-					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos}>
+					<INCLURE{fond=inclure/editer_docs_article,env,id_article=#ENV{id_article},ajax=les_photos,type=article}>
 				</fieldset>
 			</div>
 
diff --git a/inclure/editer_docs_article.html b/inclure/editer_docs_article.html
index 521cd30..8e9847b 100644
--- a/inclure/editer_docs_article.html
+++ b/inclure/editer_docs_article.html
@@ -19,13 +19,13 @@
 				[(#CREDITS*|=={une}|?{
 					<i class="fas fa-check green"></i> Au premier plan
 					,
-					<a class="btn btn_une" href="[(#URL_ACTION_AUTEUR{promouvoir_photo, [(#ID_DOCUMENT)]-[(#ENV{id_article})]})]" title="Mettre en première photo">
+					<a class="btn btn_une" href="[(#URL_ACTION_AUTEUR{promouvoir_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})][-(#ENV{type})]})]" title="Mettre en première photo">
 						<i class="fas fa-check"></i> Mettre au premier plan
 					</a>
 				})]
 				]
 				</div>
-				<a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)]-[(#ENV{id_article})]})]" title="Supprimer la photo">
+				<a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})][-(#ENV{type})]})]" title="Supprimer la photo">
 					<i class="fas fa-trash red"></i> Supprimer
 				</a>