composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-30 09:58:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename TopBar Action to QuickAction

Browse Source
This commit is contained in:
Stephen Abello
2026-08-25 10:18:57 +02:00
parent 832c2ca8fb
commit 259cef6b2a
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sources/Application/UI/Base/Layout/TopBar/TopBar.php
View File

@@ -25,7 +25,6 @@ use Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch;
use Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate;
use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar;
use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarAction\TopBarQuickAction;
use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarAction\TopBarQuickActionJS;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
@@ -50,8 +49,8 @@ class TopBar extends UIBlock
protected $oBreadcrumbs;
/** @var Toolbar|null */
protected $oToolbar;
/** @var array $aActions */
protected array $aActions = [];
/** @var array $aQuickActions */
protected array $aQuickActions = [];
/**
* TopBar constructor.
@@ -220,7 +219,7 @@ class TopBar extends UIBlock
}
// Add object arrays
$aSubBlocksNames = ['Actions'];
$aSubBlocksNames = ['QuickActions'];
foreach ($aSubBlocksNames as $sSubBlockName) {
$sHasMethodName = 'Has'.$sSubBlockName;
if (true === call_user_func_array([$this, $sHasMethodName], [])) {
@@ -234,25 +233,25 @@ class TopBar extends UIBlock
return $aSubBlocks;
}
public function HasActions(): bool
public function HasQuickActions(): bool
{
return count($this->GetActions()) > 0;
return count($this->GetQuickActions()) > 0;
}
public function GetActions(): array
public function GetQuickActions(): array
{
return $this->aActions;
return $this->aQuickActions;
}
public function SetActions(array $aActions)
public function SetQuickActions(array $aQuickActions): static
{
$this->aActions = $aActions;
$this->aQuickActions = $aQuickActions;
return $this;
}
public function AddAction(TopBarQuickAction $oAction)
public function AddQuickAction(TopBarQuickAction $oQuickAction): static
{
$this->aActions[] = $oAction;
$this->aQuickActions[] = $oQuickAction;
return $this;
}
}

2
sources/Application/UI/Base/Layout/TopBar/TopBarFactory.php
View File

@@ -64,7 +64,7 @@ class TopBarFactory
/** @var \iPopupMenuExtension $oExtensionInstance */
foreach (InterfaceDiscovery::GetInstance()->FindItopClasses('iPopupMenuExtension') as $oExtensionInstance) {
foreach ($oExtensionInstance::EnumItems(iPopupMenuExtension::MENU_TOPBAR_ACTIONS, []) as $oMenuItem) {
$oTopBar->AddAction(TopBarQuickActionFactory::MakeFromApplicationPopupItem($oMenuItem));
$oTopBar->AddQuickAction(TopBarQuickActionFactory::MakeFromApplicationPopupItem($oMenuItem));
}
}

2
templates/base/layouts/top-bar/layout.html.twig
View File

@@ -6,7 +6,7 @@
{% if oUIBlock.HasGlobalSearch() %}
{{ render_block(oUIBlock.GetGlobalSearch(), {aPage: aPage}) }}
{% endif %}
{% for oAction in oUIBlock.GetActions() %}
{% for oAction in oUIBlock.GetQuickActions() %}
{{ render_block(oAction, {aPage: aPage}) }}
{% endfor %}
</div>