On généralise et simplifie la transmission des redirections après les actions liées aux documents

This commit is contained in:
Pierre 2020-03-14 02:40:17 +01:00
parent f52f327bac
commit 87d308b849
4 changed files with 6 additions and 17 deletions

View file

@ -4,7 +4,7 @@ if (!defined('_ECRIRE_INC_VERSION')) return;
function action_inverser_ordre_dist(){ function action_inverser_ordre_dist(){
$securiser_action = charger_fonction('securiser_action', 'inc'); $securiser_action = charger_fonction('securiser_action', 'inc');
$arg = $securiser_action(); $arg = $securiser_action();
list($id_objet,$objet,$ordre,$retour)=explode('/',$arg); list($id_objet,$objet,$ordre)=explode('/',$arg);
$id_objet = intval($id_objet); $id_objet = intval($id_objet);

View file

@ -8,7 +8,7 @@ function action_promouvoir_photo_dist(){
$Targs = explode('-', $arg); $Targs = explode('-', $arg);
$id_document = intval($Targs[0]); $id_document = intval($Targs[0]);
$id_article = intval($Targs[1]); $id_article = intval($Targs[1]);
$type = $Targs[2];
if (!$id_document OR !$id_article) if (!$id_document OR !$id_article)
return false; return false;
@ -34,10 +34,5 @@ function action_promouvoir_photo_dist(){
// Cache // Cache
include_spip('inc/invalideur'); include_spip('inc/invalideur');
suivre_invalideur("id='id_article/$id_article'"); suivre_invalideur("id='id_article/$id_article'");
// redirection sur la page d'édition de l'article
$retour = "spip.php?page=editer_$type&id_article=$id_article#les_photos";
include_spip('inc/headers');
redirige_par_entete($retour);
} }

View file

@ -7,7 +7,6 @@ function action_supprimer_photo_dist(){
$Targs = explode('-', $arg); $Targs = explode('-', $arg);
$id_document = intval($Targs[0]); $id_document = intval($Targs[0]);
$id_article = intval($Targs[1]); $id_article = intval($Targs[1]);
$type = $Targs[2];
include_spip('inc/autoriser'); include_spip('inc/autoriser');
@ -20,10 +19,5 @@ function action_supprimer_photo_dist(){
include_spip('inc/invalideur'); include_spip('inc/invalideur');
suivre_invalideur("id='id_article/$id_article'"); suivre_invalideur("id='id_article/$id_article'");
} }
// redirection sur la page d'édition
$retour = "spip.php?page=editer_$type&id_article=$id_article";
include_spip('inc/headers');
redirige_par_entete($retour);
} }

View file

@ -6,8 +6,8 @@
<div class="col-lg-4"> <div class="col-lg-4">
<div class="une_photo"> <div class="une_photo">
[(#TYPE_DOCUMENT|in_array{#LISTE{JPEG,PNG,GIF}}|?{ [(#TYPE_DOCUMENT|in_array{#LISTE{JPEG,PNG,GIF}}|?{
[(#FICHIER|image_recadre{320:180,-,focus}|image_reduire{320,180})], [(#FICHIER|image_recadre{320:180,-,focus,transparent}|image_reduire{320,180})],
[(#CHEMIN{img/document.png}|image_recadre{320:180,+,center}|image_reduire{320,180})] [(#CHEMIN{img/document.png}|image_recadre{320:180,+,center,transparent}|image_reduire{320,180})]
} }
)] )]
@ -19,13 +19,13 @@
[(#CREDITS*|=={une}|?{ [(#CREDITS*|=={une}|?{
<i class="fas fa-check green"></i> Au premier plan <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})][-(#ENV{type})]})]" title="Mettre en première photo"> <a class="btn btn_une" href="[(#URL_ACTION_AUTEUR{promouvoir_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})],#SELF})]" title="Mettre en première photo">
<i class="fas fa-check"></i> Mettre au premier plan <i class="fas fa-check"></i> Mettre au premier plan
</a> </a>
})] })]
] ]
</div> </div>
<a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})][-(#ENV{type})]})]" title="Supprimer la photo"> <a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})],#SELF})]" title="Supprimer la photo">
<i class="fas fa-trash red"></i> Supprimer <i class="fas fa-trash red"></i> Supprimer
</a> </a>