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

N°3628 - Navigation menu: Add visual hint on toggler when silo applied

Browse Source
This commit is contained in:
Molkobain
2021-01-18 15:40:22 +01:00
parent daba1d3bba
commit f4b9b0b313
4 changed files with 82 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,8 +67,12 @@ class NavigationMenu extends UIBlock
protected $sAppFullIconUrl;
/** @var string URL of the link on both $AppXXXIconUrl */
protected $sAppIconLink;
/** @var array $aSiloSelection */
/** @var array Data to render the silo selection area */
protected $aSiloSelection;
/** @var bool Whether a silo is currently selected or not */
protected $bHasSiloSelected;
/** @var string|null Current silo label */
protected $sSiloLabel;
/** @var array $aMenuGroups */
protected $aMenuGroups;
/** @var array $aUserData */
@@ -159,6 +163,24 @@ class NavigationMenu extends UIBlock
{
return $this->aSiloSelection;
}
/**
* @uses $bHasSiloSelected
* @return bool
*/
public function HasSiloSelected(): bool
{
return $this->bHasSiloSelected;
}
/**
* @uses $sSiloLabel
* @return string|null
*/
public function GetSiloLabel()
{
return $this->sSiloLabel;
}
/**
* @return array
@@ -253,6 +275,9 @@ class NavigationMenu extends UIBlock
*/
public function ComputeSiloSelection()
{
$this->bHasSiloSelected = false;
$this->sSiloLabel = null;
//TODO 3.0 Use components if we have the time to build select/autocomplete components before release
// List of visible Organizations
$iCount = 0;
@@ -285,6 +310,13 @@ class NavigationMenu extends UIBlock
default:
$oAppContext = new ApplicationContext();
$iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
if(!empty($iCurrentOrganization)) {
$oCurrentOrganization = MetaModel::GetObject('Organization', $iCurrentOrganization, true, true);
$this->bHasSiloSelected = true;
$this->sSiloLabel = $oCurrentOrganization->GetRawName();
}
$this->aSiloSelection['html'] = '<form data-role="ibo-navigation-menu--silo-selection--form" action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php">'; //<select class="org_combo" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
$oPage = new \CaptureWebPage();