From a86e3d42635701e94016124670baf465f6d511f9 Mon Sep 17 00:00:00 2001
From: Anne-Cath <anne-catherine.cognet@combodo.com>
Date: Fri, 22 Nov 2024 11:32:03 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B06663=20-=20Request=20template=20fields?=
 =?UTF-8?q?=20do=20not=20apply=20portal=20silos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FieldRenderer/BsSelectObjectFieldRenderer.php        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
index b91d53dec0..b2ba3d384d 100644
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
@@ -21,6 +21,7 @@
 namespace Combodo\iTop\Renderer\Bootstrap\FieldRenderer;
 
 use ApplicationContext;
+use Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
 use Combodo\iTop\Renderer\RenderingOutput;
 use ContextTag;
 use CoreException;
@@ -29,6 +30,7 @@
 use Exception;
 use IssueLog;
 use MetaModel;
+use ModuleDesign;
 use utils;
 
 /**
@@ -104,7 +106,12 @@ public function Render()
 					$oOutput->AddHtml('<select id="' . $this->oField->GetGlobalId() . '" name="' . $this->oField->GetId() . '" class="form-control">');
 					$oOutput->AddHtml('<option value="">')->AddHtml(Dict::S('UI:SelectOne'), false)->AddHtml('</option>');
 					// - Retrieving choices
-					$oChoicesSet = new DBObjectSet($oSearch);
+                    $sPortalId =$_ENV['PORTAL_ID'];
+                    $oModuleDesign = new ModuleDesign($_ENV['PORTAL_ID']);
+                    $oScopeValidatorHelper = new ScopeValidatorHelper( $oModuleDesign, $sPortalId);
+                    $oScopeValidatorHelper->AddScopeToQuery($oSearch, $oSearch->GetClass());
+
+                    $oChoicesSet = new DBObjectSet($oSearch);
 					$oChoicesSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
 					while ($oChoice = $oChoicesSet->Fetch())
 					{