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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Molkobain
2022-01-12 15:54:18 +01:00
parent c17ceb1702 31e7a5383c
commit 812606db78
93 changed files with 4027 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -351,6 +351,11 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
$this->aSiloSelection['html'] .= $oAppContext->GetForForm(); // Pass what remains, if anything...
$this->aSiloSelection['html'] .= '</form>';
$sAddClearButton = "";
if ($this->bHasSiloSelected ){
$sAddClearButton = "$('#mini_clear_org_id').removeClass('ibo-is-hidden');";
}
$sPageJS = $oPage->GetJS();
$sPageReadyJS = $oPage->GetReadyJS();
$this->aSiloSelection['js'] =
@@ -359,6 +364,7 @@ $sPageJS
$sPageReadyJS
$('[data-role="ibo-navigation-menu--silo-selection--form"] #org_id').on('extkeychange', function() { $('[data-role="ibo-navigation-menu--silo-selection--form"]').submit(); } )
$('[data-role="ibo-navigation-menu--silo-selection--form"] #label_org_id').on('click', function() { if ($('[data-role="ibo-navigation-menu--silo-selection--form"] #org_id').val() == '') { $(this).val(''); } } );
$sAddClearButton
JS;
}
}