From 79445a64f9fb364e797f5594bdde1fefd257c4de Mon Sep 17 00:00:00 2001 From: chankalan Date: Mon, 25 Oct 2021 15:51:52 +0200 Subject: [PATCH] =?UTF-8?q?le=20bouton=20"importer=20l=E2=80=99=C3=A9missi?= =?UTF-8?q?on"=20au=20pilieu=20de=20la=20page=20pour=20retour=20ajax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action/importer_emission.php | 5 +++- libreavous_pipelines.php | 30 +++++++++++++++++-- paquet.xml | 11 +++---- .../squelettes/inclure/importer_emission.html | 5 ++-- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/action/importer_emission.php b/action/importer_emission.php index dc4e7d6..74da537 100644 --- a/action/importer_emission.php +++ b/action/importer_emission.php @@ -7,8 +7,10 @@ return; * Importation du JSON des chapitres * et des autres informations (durée, taille, etc) ***************************************/ +include_spip('inc/actions'); function action_importer_emission_dist($arg = null) { + if (!$arg) { $securiser_action = charger_fonction('securiser_action', 'inc'); $arg = $securiser_action(); @@ -152,7 +154,8 @@ function action_importer_emission_dist($arg = null) { if (count($erreurs) > 0) { $texteReponse .= "

Erreurs :
".implode("
", $erreurs); } - return $texteReponse; +// return $texteReponse; + ajax_retour($texteReponse, false); } function libreavous_import_getDuration($code_emission, $code_sujet) { diff --git a/libreavous_pipelines.php b/libreavous_pipelines.php index c6f70f5..c7ef6bc 100644 --- a/libreavous_pipelines.php +++ b/libreavous_pipelines.php @@ -80,10 +80,34 @@ function libreavous_boite_infos($flux) { } } - if ($flux['args']['type'] == 'article' and $id_article = $flux['args']['id'] and autoriser('instituer', 'article', $id_article)) { - $flux['data'] .= recuperer_fond('prive/squelettes/inclure/importer_emission', array('id_article'=>$id_article)); + return $flux; +} + +/** + * Afficher des choses au milieu de la page + * + * @pipeline affiche_milieu + * @param array $flux Données du pipeline + * @return array Données du pipeline +**/ +function libreavous_affiche_milieu($flux) { + $texte = ''; + $e = trouver_objet_exec($flux['args']['exec']); + + if ($e and !$e['edition'] and in_array($e['type'], array('article')) ) { + $texte .= recuperer_fond('prive/squelettes/inclure/importer_emission', array( + 'id_article' => $flux['args'][$e['id_table_objet']] + )); } - + + if ($texte) { + if ($p = strpos($flux['data'], '')) { + $flux['data'] = substr_replace($flux['data'], $texte, $p, 0); + } else { + $flux['data'] .= $texte; + } + } + return $flux; } diff --git a/paquet.xml b/paquet.xml index b60ea85..90cd88b 100644 --- a/paquet.xml +++ b/paquet.xml @@ -23,11 +23,12 @@ - - - - - + + + + + + diff --git a/prive/squelettes/inclure/importer_emission.html b/prive/squelettes/inclure/importer_emission.html index adbdc1e..abe965a 100644 --- a/prive/squelettes/inclure/importer_emission.html +++ b/prive/squelettes/inclure/importer_emission.html @@ -1,2 +1,3 @@ - -[(#BOUTON_ACTION{<:libreavous:importer_l_emission:>,#URL_ACTION_AUTEUR{importer_emission,#ID_ARTICLE,#SELF}})] +
+[(#BOUTON_ACTION{<:libreavous:importer_l_emission:>,#URL_ACTION_AUTEUR{importer_emission,#ID_ARTICLE}, 'ajax', 'Confirmer ou annuler l’import'})] +
\ No newline at end of file