From 9f97d9e5e6d04b06892c384aba8f8fce252468d3 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 29 Oct 2019 23:06:27 +0100
Subject: [PATCH] [10.0.55.dev] Page enfant option HomPageId

---
 core/core.php                          | 13 +++++++------
 core/module/page/page.php              |  8 +++++---
 core/module/page/view/edit/edit.js.php | 16 ++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/core.php b/core/core.php
index 59527bdc..d5f94073 100644
--- a/core/core.php
+++ b/core/core.php
@@ -31,7 +31,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.54.dev';
+	const ZWII_VERSION = '10.0.55.dev';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
@@ -484,14 +484,15 @@ class common {
 	 */
 	public function getHomePageId () {
 		$hierarchy = $this->getHierarchy(null, true);
-		//echo "<pre>";
-		//var_dump($hierarchy);
-		//die();
-		foreach($hierarchy as $parentPageId => $childrenPageIds) {
-			//var_dump($hierarchyPageId);
+		foreach($this->getHierarchy(null, null, null) as $parentPageId => $childrenPageIds) {
 			if ($this->getData(['page',$parentPageId,"homePageId"]) === true) {			
 				return ($parentPageId);
 			}
+			foreach($childrenPageIds as $childKey) {
+				if ($this->getData(['page',$childKey,"homePageId"]) === true) {			
+					return ($childKey);
+				}			
+			}
 		}
 	}
 
diff --git a/core/module/page/page.php b/core/module/page/page.php
index f271fd46..048276af 100755
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -241,8 +241,11 @@ class page extends common {
 				}
 				// Reset homePage
 				if ($this->getinput('pageHomePageId', helper::FILTER_BOOLEAN) === true ) {
-					foreach($hierarchy as $hierarchyPageId) {
-						$this->setData(['page',$hierarchyPageId,"homePageId", false]);						
+					foreach ($hierarchy as $hierarchyPageId) {
+						$this->setData(['page',$hierarchyPageId,"homePageId", false]);	
+						foreach ($hierarchyPageId as $childId) {
+							$this->setData(['page',$childId,"homePageId", false]);
+						}
 					}
 				}
 				// Modifie la page ou en crée une nouvelle si l'id a changé
@@ -348,5 +351,4 @@ class page extends common {
 			]);
 		}
 	}
-
 }
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 7889aa65..7023907d 100755
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -183,13 +183,13 @@ $( document ).ready(function() {
 	if ($("#pageEditParentPageId").val() !== "") {
 		  $("#pageEditHideMenuChildrenWrapper").removeClass("disabled");
 			$("#pageEditHideMenuChildrenWrapper").slideUp();
-			$("#pageHomePageIdWrapper").removeClass("disabled");
-			$("#pageHomePageIdWrapper").slideUp();		
+			//$("#pageHomePageIdWrapper").removeClass("disabled");
+			//$("#pageHomePageIdWrapper").slideUp();		
 		}	else {
 			$("#pageEditHideMenuChildrenWrapper").addClass("disabled");
 			$("#pageEditHideMenuChildrenWrapper").slideDown();
-			$("#pageHomePageIdWrapper").addClass("disabled");
-			$("#pageHomePageIdWrapper").slideDown();
+			//$("#pageHomePageIdWrapper").addClass("disabled");
+			//$("#pageHomePageIdWrapper").slideDown();
 		}
 
 });
@@ -409,13 +409,13 @@ pageEditParentPageIdDOM.on("change", function() {
 	if ($(this).val() !== "") {
 		  $("#pageEditHideMenuChildrenWrapper").removeClass("disabled");
 			$("#pageEditHideMenuChildrenWrapper").slideUp();
-			$("#pageHomePageIdWrapper").removeClass("disabled");
-			$("#pageHomePageIdWrapper").slideUp();
+			//$("#pageHomePageIdWrapper").removeClass("disabled");
+			//$("#pageHomePageIdWrapper").slideUp();
 		}	else {
 			$("#pageEditHideMenuChildrenWrapper").addClass("disabled");
 			$("#pageEditHideMenuChildrenWrapper").slideDown();
-			$("#pageHomePageIdWrapper").addClass("disabled");
-			$("#pageHomePageIdWrapper").slideDown();
+			//$("#pageHomePageIdWrapper").addClass("disabled");
+			//$("#pageHomePageIdWrapper").slideDown();
 		}
 });