bug boutons page article

2 files changed, 18 insertions, 23 deletions

diff --git a/public/js/tinymce.js b/public/js/tinymce.js
index 8aa9368..8aeaac8 100644
--- a/public/js/tinymce.js
+++ b/public/js/tinymce.js
@@ -1,6 +1,6 @@
 let editors = {};
 
-function openEditor(articleId) {
+function openEditor(articleId, page = '') {
     // Récupérer et sauvegarder le contenu d'origine de l'article
     const articleContent = document.getElementById(articleId).innerHTML;
     document.getElementById(articleId).setAttribute('data-original-content', articleContent);
@@ -20,17 +20,14 @@ function openEditor(articleId) {
             editor.on('init', function () {
                 editors[articleId] = editor;
                 
-                // Masquer le bouton "Modifier" et afficher les boutons "Annuler" et "Soumettre"
-                if(articleId != 'new')
-                {
-                    document.querySelector(`#edit-${articleId}`).classList.add('hidden');
-                    document.querySelector(`#delete-${articleId}`).classList.add('hidden');
+                // boutons "Modifier", "Supprimer", "déplacer vers le haut", "déplacer vers le bas", "Annuler" et "Soumettre"
+                document.querySelector(`#edit-${articleId}`).classList.add('hidden');
+                document.querySelector(`#delete-${articleId}`).classList.add('hidden');
+                // boutons absents page article
+                if(page != 'article'){
                     document.querySelector(`#position_up-${articleId}`).classList.add('hidden');
                     document.querySelector(`#position_down-${articleId}`).classList.add('hidden');
                 }
-                else{
-                    document.querySelector(`#new-${articleId}`).classList.add('hidden');
-                }
                 document.querySelector(`#cancel-${articleId}`).classList.remove('hidden');
                 document.querySelector(`#submit-${articleId}`).classList.remove('hidden');
                 
@@ -78,7 +75,7 @@ function deleteArticle(articleId, page = '') {
         })
         .then(response => response.json())
         .then(data => {
-            if (data.success)
+            if(data.success)
             {
                 if(page == 'article'){
                     // redirection vers la page d'accueil
@@ -102,7 +99,7 @@ function deleteArticle(articleId, page = '') {
     }
 }
 
-function closeEditor(articleId, display_old = true)
+function closeEditor(articleId, page = '', display_old = true)
 {
     // Fermer l'éditeur
     tinymce.remove(`#${articleId}`);
@@ -114,21 +111,19 @@ function closeEditor(articleId, display_old = true)
         document.getElementById(articleId).innerHTML = originalContent;
     }
 
-    // Afficher le bouton "Modifier" et masquer les boutons "Annuler" et "Soumettre"
-    if(articleId != 'new'){
-        document.querySelector(`#edit-${articleId}`).classList.remove('hidden');
-        document.querySelector(`#delete-${articleId}`).classList.remove('hidden');
+    // boutons "Modifier", "Supprimer", "déplacer vers le haut", "déplacer vers le bas", "Annuler" et "Soumettre"
+    document.querySelector(`#edit-${articleId}`).classList.remove('hidden');
+    document.querySelector(`#delete-${articleId}`).classList.remove('hidden');
+    // boutons absents page article
+    if(page != 'article'){
         document.querySelector(`#position_up-${articleId}`).classList.remove('hidden');
         document.querySelector(`#position_down-${articleId}`).classList.remove('hidden');
     }
-    else{
-        document.querySelector(`#new-${articleId}`).classList.remove('hidden');
-    }
     document.querySelector(`#cancel-${articleId}`).classList.add('hidden');
     document.querySelector(`#submit-${articleId}`).classList.add('hidden');
 }
 
-function submitArticle(articleId) {
+function submitArticle(articleId, page = '') {
     // Récupérer l'éditeur correspondant à l'article
     const editor = editors[articleId];
     if (!editor) {
@@ -151,7 +146,7 @@ function submitArticle(articleId) {
     .then(data => {
         if (data.success) {
             // Fermer l'éditeur et mettre à jour le contenu de l'article
-            closeEditor(articleId, false);
+            closeEditor(articleId, page, false);
             document.getElementById(articleId).innerHTML = newContent;
         }
         else {
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index 56d1f4d..94823bd 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -50,7 +50,7 @@ class NewBuilder extends AbstractBuilder
             if($_SESSION['admin'])
             {
                 if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
-                    $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
+                    $modify_js = 'onclick="openEditor(\'' . $id . '\', \'article\')"';
                     $modify_article = '<p id="edit-' . $id . '"><a href="#"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></a></p>' . "\n";
 
                     $up_button = '';
@@ -59,10 +59,10 @@ class NewBuilder extends AbstractBuilder
                     $delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . CURRENT_PAGE . '\')"';
                     $delete_article = '<p id="delete-' . $id . '"><a href="#"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></a></p>' . "\n";
                     
-                    $close_js = 'onclick="closeEditor(\'' . $id . '\')"';
+                    $close_js = 'onclick="closeEditor(\'' . $id . '\', \'article\')"';
                     $close_editor = '<p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js . '>Annuler</button></a></p>';
                     
-                    $submit_js = 'onclick="submitArticle(\'' . $id . '\')"';
+                    $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';
                     $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js . '>Valider</button></a></p>';
                 }
                 else{