From 04e0fd053d27beec17856fb56a276439c5aba9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Fri, 24 Jan 2025 19:40:43 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20du=20formulaire=20=C3=A9dition=20de?=
 =?UTF-8?q?=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/page/page.php              | 34 ++++++--------
 core/module/page/view/edit/edit.js.php | 63 +++++++++++++++-----------
 core/module/page/view/edit/edit.php    |  8 ++--
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/core/module/page/page.php b/core/module/page/page.php
index f6a7461f..c917729a 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -24,7 +24,6 @@ class page extends common
 		'duplicate' => self::GROUP_EDITOR,
 		'jsEditor' => self::GROUP_EDITOR,
 		'cssEditor' => self::GROUP_EDITOR,
-		'register' => self::GROUP_EDITOR,
 	];
 	public static $pagesNoParentId = [
 		'' => 'Aucune'
@@ -560,6 +559,19 @@ class page extends common
 						]
 					]);
 
+					/**
+					 * Sauvegarde l'onglet de l'utilisateur
+					 */
+					$this->setData([
+						'user',
+						$this->getUser('id'),
+						'view',
+						[
+							'page' => $this->getInput('containerSelected'),
+							'config' => $this->getData(['user', $this->getUser('id'), 'view', 'config']),
+						]
+					]);
+
 					// Creation du contenu de la page
 					if (!is_dir(self::DATA_DIR . self::$siteContent . '/content')) {
 						mkdir(self::DATA_DIR . self::$siteContent . '/content', 0755);
@@ -726,24 +738,4 @@ class page extends common
 		return json_encode($d);
 	}
 
-	/**
-	 * Stocke la variable dans les paramètres de l'utilisateur pour activer la tab à sa prochaine visite
-	 * @return never
-	 */
-	public function register(): void
-	{
-		$this->setData([
-			'user',
-			$this->getUser('id'),
-			'view',
-			[
-				'page' => $this->getUrl(2),
-				'config' => $this->getData(['user', $this->getUser('id'), 'view', 'config']),
-			]
-		]);
-		// Valeurs en sortie
-		$this->addOutput([
-			'redirect' => helper::baseUrl() . 'page/edit/' . $this->getUrl(3) . '/' . self::$siteContent,
-		]);
-	}
 }
\ No newline at end of file
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index b959f8b6..0b473f7f 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -54,24 +54,23 @@ function protectModule() {
 */
 $( document ).ready(function() {
 
-		// Changement de profil
+	// Changement de profil
+	$(".pageEditGroupProfil").hide();
+	$("#pageEditGroupProfil" + $("#pageEditGroup").val()).show();
+
+	$("#pageEditGroup").on("change", function () {
 		$(".pageEditGroupProfil").hide();
-		$("#pageEditGroupProfil" + $("#pageEditGroup").val()).show();
-	
-		$("#pageEditGroup").on("change", function () {
-			$(".pageEditGroupProfil").hide();
-			$("#pageEditGroupProfil" + $(this).val()).show();
-		});
-	
+		$("#pageEditGroupProfil" + $(this).val()).show();
+	});
+
 
 	/**
 	 * Sélection des onglets
 	 */
 	var pageLayout = "<?php echo $this->getData(['user', $this->getUser('id'), 'view', 'page']);?>";
-
 	// Non défini, valeur par défaut
 	if (pageLayout == "") {
-		 pageLayout = "content"; 
+		 pageLayout = "content";
 	 }
 	 // Tout cacher
 	 $("#pageEditContentContainer").hide();
@@ -284,10 +283,18 @@ $( document ).ready(function() {
  	// Gestion des évènements
 	//--------------------------------------------------------------------------------------
 
+	/**
+     * Transmet le bouton de l'onglet sélectionné avant la soumission
+     */
+		$('#pageEditForm').on('submit', function () {
+			$('#containerSelected').val(pageLayout);
+		});
+
 	/**
      *  Sélection de la  page de configuration à afficher
      */
 		 $("#pageEditContentButton").on("click", function () {
+			pageLayout = "locale";
 			$("#pageEditContentContainer").show();
 			$("#pageEditExtensionContainer").hide();
 			$("#pageEditPositionContainer").hide();
@@ -295,23 +302,12 @@ $( document ).ready(function() {
 			$("#pageEditPermissionContainer").hide();
 			$("#pageEditContentButton").addClass("activeButton");
 			$("#pageEditExtensionButton").removeClass("activeButton");
-			$("#PageEditPositionButton").removeClass("activeButton");
+			$("#pageEditPositionButton").removeClass("activeButton");
 			$("#pageEditLayoutButton").removeClass("activeButton");
 			$("#pageEditPermissionButton").removeClass("activeButton");
 		});
-		$("#pageEditExtensionButton").on("click", function () {
-			$("#pageEditContentContainer").hide();
-			$("#pageEditExtensionContainer").show();
-			$("#pageEditPositionContainer").hide();
-			$("#pageEditLayoutContainer").hide();
-			$("#pageEditPermissionContainer").hide();
-			$("#pageEditContentButton").removeClass("activeButton");
-			$("#pageEditExtensionButton").addClass("activeButton");
-			$("#PageEditPositionButton").removeClass("activeButton");
-			$("#pageEditLayoutButton").removeClass("activeButton");
-			$("#pageEditPermissionButton").removeClass("activeButton");
-		});
-		$("#PageEditPositionButton").on("click", function () {
+		$("#pageEditPositionButton").on("click", function () {
+			pageLayout = "position";
 			$("#pageEditContentContainer").hide();
 			$("#pageEditExtensionContainer").hide();
 			$("#pageEditPositionContainer").show();
@@ -319,11 +315,25 @@ $( document ).ready(function() {
 			$("#pageEditPermissionContainer").hide();
 			$("#pageEditContentButton").removeClass("activeButton");
 			$("#pageEditExtensionButton").removeClass("activeButton");
-			$("#PageEditPositionButton").addClass("activeButton");
+			$("#pageEditPositionButton").addClass("activeButton");
+			$("#pageEditLayoutButton").removeClass("activeButton");
+			$("#pageEditPermissionButton").removeClass("activeButton");
+		});
+		$("#pageEditExtensionButton").on("click", function () {
+			pageLayout = "extension";
+			$("#pageEditContentContainer").hide();
+			$("#pageEditExtensionContainer").show();
+			$("#pageEditPositionContainer").hide();
+			$("#pageEditLayoutContainer").hide();
+			$("#pageEditPermissionContainer").hide();
+			$("#pageEditContentButton").removeClass("activeButton");
+			$("#pageEditExtensionButton").addClass("activeButton");
+			$("#pageEditPositionButton").removeClass("activeButton");
 			$("#pageEditLayoutButton").removeClass("activeButton");
 			$("#pageEditPermissionButton").removeClass("activeButton");
 		});
 		$("#pageEditLayoutButton").on("click", function () {
+			pageLayout = "layout";
 			$("#pageEditContentContainer").hide();
 			$("#pageEditExtensionContainer").hide();
 			$("#pageEditPositionContainer").hide();
@@ -331,11 +341,12 @@ $( document ).ready(function() {
 			$("#pageEditPermissionContainer").hide();
 			$("#pageEditContentButton").removeClass("activeButton");
 			$("#pageEditExtensionButton").removeClass("activeButton");
-			$("#PageEditPositionButton").removeClass("activeButton");
+			$("#pageEditPositionButton").removeClass("activeButton");
 			$("#pageEditLayoutButton").addClass("activeButton");
 			$("#pageEditPermissionButton").removeClass("activeButton");
 		});
 		$("#pageEditPermissionButton").on("click", function () {
+			pageLayout = "permission";
 			$("#pageEditContentContainer").hide();
 			$("#pageEditExtensionContainer").hide();
 			$("#pageEditPositionContainer").hide();
diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php
index b866f271..8df0271c 100644
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@@ -32,30 +32,28 @@
 	<?php echo template::button('pageEditContentButton', [
 		'value' => 'Contenu',
 		'class' => 'buttonTab',
-		'href' => helper::baseUrl() . 'page/register/content/' . $this->geturl(2)
 	]); ?>
 	<?php echo template::button('pageEditPositionButton', [
 		'value' => 'Menu',
 		'class' => 'buttonTab',
-		'href' => helper::baseUrl() . 'page/register/position/' . $this->geturl(2)
 	]); ?>
 	<?php echo template::button('pageEditExtensionButton', [
 		'value' => 'Extension',
 		'class' => 'buttonTab',
-		'href' => helper::baseUrl() . 'page/register/extension/' . $this->geturl(2)
 	]); ?>
 	<?php echo template::button('pageEditLayoutButton', [
 		'value' => 'Mise en page',
 		'class' => 'buttonTab',
-		'href' => helper::baseUrl() . 'page/register/layout/' . $this->geturl(2)
 	]); ?>
 	<?php echo template::button('pageEditPermissionButton', [
 		'value' => 'Permission',
 		'class' => 'buttonTab',
-		'href' => helper::baseUrl() . 'page/register/permission/' . $this->geturl(2)
 	]); ?>
 </div>
 
+<!-- Champ caché pour transmettre l'onglet-->
+<?php echo template::hidden('containerSelected'); ?>
+
 <div id="pageEditContentContainer" class="tabContent">
 	<div class="row">
 		<div class="col12">