From 3b60e63c9733fdca385fde2359de29054ac4bd17 Mon Sep 17 00:00:00 2001
From: Anne-Catherine <57360138+accognet@users.noreply.github.com>
Date: Fri, 18 Apr 2025 13:01:19 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B06663=20-=20Request=20template=20fields?=
 =?UTF-8?q?=20do=20not=20apply=20portal=20silos=20(#684)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FieldRenderer/BsSelectObjectFieldRenderer.php   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
index b91d53dec..9c92c7d28 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 Dict;
 use Exception;
 use IssueLog;
 use MetaModel;
+use ModuleDesign;
 use utils;
 
 /**
@@ -103,8 +105,15 @@ class BsSelectObjectFieldRenderer extends BsFieldRenderer
 					$oOutput->AddHtml('<div class="col-xs-' . ( $this->oField->GetHierarchical() ? 10 : 12 ) . ' col-sm-' . ( $this->oField->GetHierarchical() ? 9 : 12 ) . ' col-md-' . ( $this->oField->GetHierarchical() ? 10 : 12 ) . '">');
 					$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);
+
+                     if (defined('PORTAL_ID'))
+                    {
+                        $oModuleDesign = new ModuleDesign(PORTAL_ID);
+                        $oScopeValidatorHelper = new ScopeValidatorHelper($oModuleDesign, PORTAL_ID);
+                        $oScopeValidatorHelper->AddScopeToQuery($oSearch, $oSearch->GetClass());
+                    }
+
+                    $oChoicesSet = new DBObjectSet($oSearch);
 					$oChoicesSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
 					while ($oChoice = $oChoicesSet->Fetch())
 					{