composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5620-renaming IsOrgMenuFilterAllowed<-IsSiloSelectionEnabled and made public

Browse Source
This commit is contained in:
odain
2022-11-22 07:31:12 +01:00
parent a5ea868609
commit ad052dd861
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -289,7 +289,7 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
}
}
private function IsOrgMenuFilterAllowed() : bool {
public function IsSiloSelectionEnabled() : bool {
return MetaModel::GetConfig()->Get('navigation_menu.show_organization_filter');
}
@@ -304,7 +304,7 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
$this->bHasSiloSelected = false;
$this->sSiloLabel = null;
if (! $this->IsOrgMenuFilterAllowed()){
if (! $this->IsSiloSelectionEnabled()){
return;
}

4
test/application/UI/Base/Layout/NavigationMenuTest.php
View File

@@ -32,7 +32,7 @@ class NavigationMenuTest extends ItopDataTestCase {
$this->createMock(ApplicationContext::class),
$this->createMock(PopoverMenu::class));
$isAllowed = $this->InvokeNonPublicMethod(NavigationMenu::class, "IsOrgMenuFilterAllowed", $oNavigationMenu, []);
$isAllowed = $oNavigationMenu->IsSiloSelectionEnabled();
$this->assertEquals($bExpectedIsAllowed, $isAllowed);
}
@@ -65,7 +65,7 @@ class NavigationMenuTest extends ItopDataTestCase {
$this->createMock(PopoverMenu::class)
);
$isAllowed = $this->InvokeNonPublicMethod(NavigationMenu::class, "IsOrgMenuFilterAllowed", $oNavigationMenu, []);
$isAllowed = $oNavigationMenu->IsSiloSelectionEnabled();
$oReflexionClass->setStaticPropertyValue('m_oConfig', $oInitConfig);
$this->assertEquals(true, $isAllowed);