From 1c7a725a085d3b936cbc5364483a312285e6024c Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Tue, 20 Apr 2021 13:28:10 +0200 Subject: [PATCH] Fixed issue with node edition of Configuration for root community --- lib/object_coordination/adminnode/adminnode.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php index 415c8f7..dd564a2 100755 --- a/lib/object_coordination/adminnode/adminnode.php +++ b/lib/object_coordination/adminnode/adminnode.php @@ -402,10 +402,11 @@ Class AdminNode extends CoordinationObj $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde.blocName", "loop"); } + if(recupCommunity($node_Id1) === "3") $nodeCom = "2"; else $nodeCom = recupCommunity($node_Id1); // Génération des éléments du bloc des paramètres de communauté - if( $node_Id1 === recupCommunity($node_Id1) ) + if( $node_Id1 === recupCommunity($nodeCom) ) { - $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($node_Id1); + $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($nodeCom); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_email", "text", "node_email", htmlentitiesconv($NodeSettings->getEmail()), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("tipEmail"), ENT_QUOTES)."\"", getMessage("node_email")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ToHidde.blocSettings.node_git", "text", "node_git", htmlentitiesconv($NodeSettings->getGit()), "class=\"form\" title=\"".htmlspecialchars(getMessage("tipGit"), ENT_QUOTES)."\"", getMessage("node_git")); @@ -496,9 +497,11 @@ Class AdminNode extends CoordinationObj $Node->setHasPublic( ((isset($_POST["node_haspublic"]))?($_POST["node_haspublic"]):'off') ); // $Node->setMailNode( ((isset($_POST["user_mail"]))?($_POST["user_mail"]):"") ); - if( $node_id === recupCommunity($node_id) ) + if(recupCommunity($node_id) === "3") $nodeCom = "2"; else $nodeCom = recupCommunity($node_id); + // Génération des éléments du bloc des paramètres de communauté + if( $node_id === recupCommunity($nodeCom) ) { - $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($node_id); + $NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($nodeCom); $NodeSettings->setEmail( ((isset($_POST["node_email"]))?(htmlentitiesconv($_POST["node_email"])):"") ); $NodeSettings->setGit( ((isset($_POST["node_git"]))?(htmlentitiesconv($_POST["node_git"])):"") ); $NodeSettings->setMastodon( ((isset($_POST["node_mastodon"]))?(htmlentitiesconv($_POST["node_mastodon"])):"") ); @@ -567,8 +570,6 @@ Class AdminNode extends CoordinationObj if( DATA_ACCES_CACHE_PERMISSION ) $GLOBALS["SYSTEM_MANAGER"]["PERMISSION_CACHE"]->emptyCache(); -// exit(0); - systemRedirect( formatUrl($this->getId(), "AdminNode", "updateAdmin", "msgSave")."&node_Id1=".$Node->getId() ); return "msgSave"; }else{