Merge branch 'feature/5620-hide-org-filter-menu' into saas/3.0

sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php

@@ -294,6 +294,14 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
 		return MetaModel::GetConfig()->Get('navigation_menu.show_organization_filter');
 	}
 
+	/**
+	 * @return True if the silo selection is enabled, false otherwise
+	 * @since 3.1.0
+	 */
+	public function IsSiloSelectionEnabled() : bool {
+		return MetaModel::GetConfig()->Get('navigation_menu.show_organization_filter');
+	}
+
 	/**
 	 * @return void
 	 * @throws \CoreException

test/application/UI/Base/Layout/NavigationMenuTest.php

@@ -7,14 +7,16 @@ use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenu;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
+/**
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ * Class NavigationMenuTest
+ *
+ * @package UI\Base\Layout
+ */
 class NavigationMenuTest extends ItopDataTestCase {
-
-	public function setUp(): void
-	{
-		parent::setUp();
-		require_once(APPROOT.'application/themehandler.class.inc.php');
-	}
-
 	public function IsAllowedProvider(){
 		return [
 			'show menu' => [ true ],