composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2844 - Object details: Extract transitions from the "other actions" menu to a dedicated "transitions" menu

Browse Source
This commit is contained in:
Molkobain
2021-03-19 18:26:07 +01:00
parent de7ac4ba31
commit c2339dcb5c
2 changed files with 125 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
application/displayblock.class.inc.php
View File

@@ -1797,10 +1797,15 @@ class MenuBlock extends DisplayBlock
{ {
$this->m_sStyle = 'list'; $this->m_sStyle = 'list';
} }
$sClass = $this->m_oFilter->GetClass(); $sClass = $this->m_oFilter->GetClass();
$oSet = new CMDBObjectSet($this->m_oFilter); $oSet = new CMDBObjectSet($this->m_oFilter);
$sRefreshAction = $aExtraParams['sRefreshAction']??''; $sRefreshAction = $aExtraParams['sRefreshAction'] ?? '';
$aActions = [];
/** @var $aRegularActions Any action other than a transition */
$aRegularActions = [];
/** @var $aTransitionActions Only transitions */
$aTransitionActions = [];
if ((!isset($aExtraParams['selection_mode']) || $aExtraParams['selection_mode'] == "") && $this->m_sStyle != 'listInObject') { if ((!isset($aExtraParams['selection_mode']) || $aExtraParams['selection_mode'] == "") && $this->m_sStyle != 'listInObject') {
$oAppContext = new ApplicationContext(); $oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink(); $sContext = $oAppContext->GetForLink();
@@ -1832,9 +1837,9 @@ class MenuBlock extends DisplayBlock
case 0: case 0:
// No object in the set, the only possible action is "new" // No object in the set, the only possible action is "new"
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aActions['UI:Menu:New'] = array( $aRegularActions['UI:Menu:New'] = array(
'label' => Dict::S('UI:Menu:New'), 'label' => Dict::S('UI:Menu:New'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
) + $aActionParams; ) + $aActionParams;
} }
break; break;
@@ -1844,9 +1849,9 @@ class MenuBlock extends DisplayBlock
if (is_null($oObj)) { if (is_null($oObj)) {
if (!isset($aExtraParams['link_attr'])) { if (!isset($aExtraParams['link_attr'])) {
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aActions['UI:Menu:New'] = array( $aRegularActions['UI:Menu:New'] = array(
'label' => Dict::S('UI:Menu:New'), 'label' => Dict::S('UI:Menu:New'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
) + $aActionParams; ) + $aActionParams;
} }
} }
@@ -1869,44 +1874,43 @@ class MenuBlock extends DisplayBlock
//$aActions['concurrent_lock_unlock'] = array ('label' => Dict::S('UI:Menu:ReleaseConcurrentLock'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}"); //$aActions['concurrent_lock_unlock'] = array ('label' => Dict::S('UI:Menu:ReleaseConcurrentLock'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}");
} }
} }
$bRawModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $bRawModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
$oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
$bIsModifyAllowed = !$bLocked && $bRawModifiedAllowed; $bIsModifyAllowed = !$bLocked && $bRawModifiedAllowed;
$bIsDeleteAllowed = !$bLocked && UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet); $bIsDeleteAllowed = !$bLocked && UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
// Just one object in the set, possible actions are "new / clone / modify and delete" // Just one object in the set, possible actions are "new / clone / modify and delete"
if (!isset($aExtraParams['link_attr'])) { if (!isset($aExtraParams['link_attr'])) {
if ($bIsModifyAllowed) { if ($bIsModifyAllowed) {
$aActions['UI:Menu:Modify'] = array( $aRegularActions['UI:Menu:Modify'] = array(
'label' => Dict::S('UI:Menu:Modify'), 'label' => Dict::S('UI:Menu:Modify'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=modify&class=$sClass&id=$id{$sContext}#" 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify&class=$sClass&id=$id{$sContext}#",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aActions['UI:Menu:New'] = array( $aRegularActions['UI:Menu:New'] = array(
'label' => Dict::S('UI:Menu:New'), 'label' => Dict::S('UI:Menu:New'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsDeleteAllowed) { if ($bIsDeleteAllowed) {
$aActions['UI:Menu:Delete'] = array( $aRegularActions['UI:Menu:Delete'] = array(
'label' => Dict::S('UI:Menu:Delete'), 'label' => Dict::S('UI:Menu:Delete'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
// Transitions / Stimuli // Transitions / Stimuli
if (!$bLocked) { if (!$bLocked) {
$aTransitions = $oObj->EnumTransitions(); $aTransitions = $oObj->EnumTransitions();
if (count($aTransitions)) { if (count($aTransitions)) {
$this->AddMenuSeparator($aActions);
$aStimuli = Metamodel::EnumStimuli(get_class($oObj)); $aStimuli = Metamodel::EnumStimuli(get_class($oObj));
foreach ($aTransitions as $sStimulusCode => $aTransitionDef) { foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass, $iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass,
$sStimulusCode, $oSet) : UR_ALLOWED_NO; $sStimulusCode, $oSet) : UR_ALLOWED_NO;
switch ($iActionAllowed) { switch ($iActionAllowed) {
case UR_ALLOWED_YES: case UR_ALLOWED_YES:
$aActions[$sStimulusCode] = array( $aTransitionActions[$sStimulusCode] = array(
'label' => $aStimuli[$sStimulusCode]->GetLabel(), 'label' => $aStimuli[$sStimulusCode]->GetLabel(),
'url' => "{$sRootUrl}pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id{$sContext}",
) + $aActionParams; ) + $aActionParams;
break; break;
@@ -1916,27 +1920,29 @@ class MenuBlock extends DisplayBlock
} }
} }
} }
// Relations... // Relations...
$aRelations = MetaModel::EnumRelationsEx($sClass); $aRelations = MetaModel::EnumRelationsEx($sClass);
if (count($aRelations)) { if (count($aRelations)) {
$this->AddMenuSeparator($aActions); $this->AddMenuSeparator($aRegularActions);
foreach ($aRelations as $sRelationCode => $aRelationInfo) { foreach ($aRelations as $sRelationCode => $aRelationInfo) {
if (array_key_exists('down', $aRelationInfo)) { if (array_key_exists('down', $aRelationInfo)) {
$aActions[$sRelationCode.'_down'] = array( $aRegularActions[$sRelationCode.'_down'] = array(
'label' => $aRelationInfo['down'], 'label' => $aRelationInfo['down'],
'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
if (array_key_exists('up', $aRelationInfo)) { if (array_key_exists('up', $aRelationInfo)) {
$aActions[$sRelationCode.'_up'] = array( $aRegularActions[$sRelationCode.'_up'] = array(
'label' => $aRelationInfo['up'], 'label' => $aRelationInfo['up'],
'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
} }
} }
if ($bLocked && $bRawModifiedAllowed) {
// Add a special menu to kill the lock, but only to allowed users who can also modify this object // Add a special menu to kill the lock, but only to allowed users who can also modify this object
if ($bLocked && $bRawModifiedAllowed) {
/** @var array $aAllowedProfiles */ /** @var array $aAllowedProfiles */
$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles'); $aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
$bCanKill = false; $bCanKill = false;
@@ -1958,20 +1964,22 @@ class MenuBlock extends DisplayBlock
} }
if ($bCanKill) { if ($bCanKill) {
$this->AddMenuSeparator($aActions); $this->AddMenuSeparator($aRegularActions);
$aActions['concurrent_lock_unlock'] = array( $aRegularActions['concurrent_lock_unlock'] = array(
'label' => Dict::S('UI:Menu:KillConcurrentLock'), 'label' => Dict::S('UI:Menu:KillConcurrentLock'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}",
); );
} }
} }
} }
$this->AddMenuSeparator($aActions);
$this->AddMenuSeparator($aRegularActions);
/** @var \iApplicationUIExtension $oExtensionInstance */ /** @var \iApplicationUIExtension $oExtensionInstance */
foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance) { foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance) {
$oSet->Rewind(); $oSet->Rewind();
foreach ($oExtensionInstance->EnumAllowedActions($oSet) as $sLabel => $sUrl) { foreach ($oExtensionInstance->EnumAllowedActions($oSet) as $sLabel => $sUrl) {
$aActions[$sLabel] = array('label' => $sLabel, 'url' => $sUrl) + $aActionParams; $aRegularActions[$sLabel] = array('label' => $sLabel, 'url' => $sUrl) + $aActionParams;
} }
} }
} }
@@ -1991,36 +1999,36 @@ class MenuBlock extends DisplayBlock
$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr); $oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
$sTargetClass = $oAttDef->GetTargetClass(); $sTargetClass = $oAttDef->GetTargetClass();
if ($bIsModifyAllowed) { if ($bIsModifyAllowed) {
$aActions['UI:Menu:Add'] = array( $aRegularActions['UI:Menu:Add'] = array(
'label' => Dict::S('UI:Menu:Add'), 'label' => Dict::S('UI:Menu:Add'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsBulkModifyAllowed) { if ($bIsBulkModifyAllowed) {
$aActions['UI:Menu:Manage'] = array( $aRegularActions['UI:Menu:Manage'] = array(
'label' => Dict::S('UI:Menu:Manage'), 'label' => Dict::S('UI:Menu:Manage'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
//if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#") + $aActionParams; } //if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#") + $aActionParams; }
} else { } else {
// many objects in the set, possible actions are: new / modify all / delete all // many objects in the set, possible actions are: new / modify all / delete all
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aActions['UI:Menu:New'] = array( $aRegularActions['UI:Menu:New'] = array(
'label' => Dict::S('UI:Menu:New'), 'label' => Dict::S('UI:Menu:New'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsBulkModifyAllowed) { if ($bIsBulkModifyAllowed) {
$aActions['UI:Menu:ModifyAll'] = array( $aRegularActions['UI:Menu:ModifyAll'] = array(
'label' => Dict::S('UI:Menu:ModifyAll'), 'label' => Dict::S('UI:Menu:ModifyAll'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_modify_all&class=$sClass&filter=".urlencode($sFilter)."{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_modify_all&class=$sClass&filter=".urlencode($sFilter)."{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsBulkDeleteAllowed) { if ($bIsBulkDeleteAllowed) {
$aActions['UI:Menu:BulkDelete'] = array( $aRegularActions['UI:Menu:BulkDelete'] = array(
'label' => Dict::S('UI:Menu:BulkDelete'), 'label' => Dict::S('UI:Menu:BulkDelete'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_deletion&filter=".urlencode($sFilter)."{$sContext}" 'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_deletion&filter=".urlencode($sFilter)."{$sContext}",
) + $aActionParams; ) + $aActionParams;
} }
@@ -2039,6 +2047,7 @@ class MenuBlock extends DisplayBlock
if (isset($aExtraParams['query_params'])) { if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params']; $aQueryParams = $aExtraParams['query_params'];
} }
$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy); $sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy);
$aRes = CMDBSource::QueryToArray($sSql); $aRes = CMDBSource::QueryToArray($sSql);
if (count($aRes) == 1) { if (count($aRes) == 1) {
@@ -2046,7 +2055,6 @@ class MenuBlock extends DisplayBlock
$sState = $aRes[0]['__state__']; $sState = $aRes[0]['__state__'];
$aTransitions = Metamodel::EnumTransitions($sClass, $sState); $aTransitions = Metamodel::EnumTransitions($sClass, $sState);
if (count($aTransitions)) { if (count($aTransitions)) {
$this->AddMenuSeparator($aActions);
$aStimuli = Metamodel::EnumStimuli($sClass); $aStimuli = Metamodel::EnumStimuli($sClass);
foreach ($aTransitions as $sStimulusCode => $aTransitionDef) { foreach ($aTransitions as $sStimulusCode => $aTransitionDef) {
$oSet->Rewind(); $oSet->Rewind();
@@ -2057,9 +2065,9 @@ class MenuBlock extends DisplayBlock
switch ($iActionAllowed) { switch ($iActionAllowed) {
case UR_ALLOWED_YES: case UR_ALLOWED_YES:
case UR_ALLOWED_DEPENDS: case UR_ALLOWED_DEPENDS:
$aActions[$sStimulusCode] = array( $aTransitionActions[$sStimulusCode] = array(
'label' => $aStimuli[$sStimulusCode]->GetLabel(), 'label' => $aStimuli[$sStimulusCode]->GetLabel(),
'url' => "{$sRootUrl}pages/UI.php?operation=select_bulk_stimulus&stimulus=$sStimulusCode&state=$sState&class=$sClass&filter=".urlencode($sFilter)."{$sContext}" 'url' => "{$sRootUrl}pages/UI.php?operation=select_bulk_stimulus&stimulus=$sStimulusCode&state=$sState&class=$sClass&filter=".urlencode($sFilter)."{$sContext}",
) + $aActionParams; ) + $aActionParams;
break; break;
@@ -2073,7 +2081,8 @@ class MenuBlock extends DisplayBlock
} }
} }
$this->AddMenuSeparator($aActions); $this->AddMenuSeparator($aRegularActions);
/** @var \iApplicationUIExtension $oExtensionInstance */ /** @var \iApplicationUIExtension $oExtensionInstance */
foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance) { foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance) {
$oSet->Rewind(); $oSet->Rewind();
@@ -2081,17 +2090,18 @@ class MenuBlock extends DisplayBlock
if (is_array($data)) { if (is_array($data)) {
// New plugins can provide javascript handlers via the 'onclick' property // New plugins can provide javascript handlers via the 'onclick' property
//TODO: enable extension of different menus by checking the 'target' property ?? //TODO: enable extension of different menus by checking the 'target' property ??
$aActions[$sLabel] = [ $aRegularActions[$sLabel] = [
'label' => $sLabel, 'label' => $sLabel,
'url' => isset($data['url']) ? $data['url'] : '#', 'url' => isset($data['url']) ? $data['url'] : '#',
'onclick' => isset($data['onclick']) ? $data['onclick'] : '' 'onclick' => isset($data['onclick']) ? $data['onclick'] : '',
]; ];
} else { } else {
// Backward compatibility with old plugins // Backward compatibility with old plugins
$aActions[$sLabel] = ['label' => $sLabel, 'url' => $data] + $aActionParams; $aRegularActions[$sLabel] = ['label' => $sLabel, 'url' => $data] + $aActionParams;
} }
} }
} }
if (empty($sRefreshAction) && $this->m_sStyle == 'list') { if (empty($sRefreshAction) && $this->m_sStyle == 'list') {
//for the detail page this var is defined way beyond this line //for the detail page this var is defined way beyond this line
$sRefreshAction = "window.location.reload();"; $sRefreshAction = "window.location.reload();";
@@ -2118,8 +2128,8 @@ class MenuBlock extends DisplayBlock
} }
if ($bToolkitMenu) { if ($bToolkitMenu) {
$sLabel = Dict::S('UI:ConfigureThisList'); $sLabel = Dict::S('UI:ConfigureThisList');
$aActions['iTop::ConfigureList'] = ['label' => $sLabel, 'url' => '#', 'onclick' => "$('#datatable_dlg_datatable_{$sId}').dialog('open'); return false;"]; $aRegularActions['iTop::ConfigureList'] = ['label' => $sLabel, 'url' => '#', 'onclick' => "$('#datatable_dlg_datatable_{$sId}').dialog('open'); return false;"];
$oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock(iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $param, $aActions, $sId)); $oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock(iPopupMenuExtension::MENU_OBJLIST_TOOLKIT, $param, $aRegularActions, $sId));
} }
break; break;
@@ -2130,24 +2140,34 @@ class MenuBlock extends DisplayBlock
break; break;
} }
$oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock($iMenuId, $param, $aActions, $sId)); $oRenderBlock->AddSubBlock(utils::GetPopupMenuItemsBlock($iMenuId, $param, $aRegularActions, $sId));
// Extract favorite actions from their menus
$aFavoriteActions = array(); $aFavoriteActions = array();
$aCallSpec = array($sClass, 'GetShortcutActions'); $aCallSpec = array($sClass, 'GetShortcutActions');
if (is_callable($aCallSpec)) { if (is_callable($aCallSpec)) {
$aShortcutActions = call_user_func($aCallSpec, $sClass); $aShortcutActions = call_user_func($aCallSpec, $sClass);
foreach ($aShortcutActions as $key) { foreach ($aShortcutActions as $key) {
if (isset($aActions[$key])) { // Regular actions
$aFavoriteActions[$key] = $aActions[$key]; if (isset($aRegularActions[$key])) {
unset($aActions[$key]); $aFavoriteActions[$key] = $aRegularActions[$key];
unset($aRegularActions[$key]);
}
// Transitions
if (isset($aTransitionActions[$key])) {
$aFavoriteActions[$key] = $aTransitionActions[$key];
unset($aTransitionActions[$key]);
} }
} }
} }
$oActionsBlock = ToolbarUIBlockFactory::MakeForAction("ibo-action-toolbar-{$sId}"); $oActionsToolbar = ToolbarUIBlockFactory::MakeForAction("ibo-actions-toolbar-{$sId}");
$oRenderBlock->AddSubBlock($oActionsBlock); $oRenderBlock->AddSubBlock($oActionsToolbar);
$sMenuTogglerId = "ibo-actions-menu-toggler-{$sId}"; $sRegularActionsMenuTogglerId = "ibo-regular-actions-menu-toggler-{$sId}";
$sPopoverMenuId = "ibo-other-action-popover-{$sId}"; $sRegularActionsPopoverMenuId = "ibo-regular-actions-popover-{$sId}";
$sTransitionActionsMenuTogglerId = "ibo-transition-actions-menu-toggler-{$sId}";
$sTransitionActionsPopoverMenuId = "ibo-transition-actions-popover-{$sId}";
if (!$oPage->IsPrintableVersion()) { if (!$oPage->IsPrintableVersion()) {
foreach ($aFavoriteActions as $sActionId => $aAction) { foreach ($aFavoriteActions as $sActionId => $aAction) {
@@ -2187,44 +2207,38 @@ class MenuBlock extends DisplayBlock
$sTarget = isset($aAction['target']) ? $aAction['target'] : ''; $sTarget = isset($aAction['target']) ? $aAction['target'] : '';
$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, $sActionId); $oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, $sActionId);
$oActionButton->AddCSSClass('ibo-action-button'); $oActionButton->AddCSSClass('ibo-action-button');
if(empty($sLabel)){ if (empty($sLabel)) {
$oActionButton->SetTooltip(Dict::S($sActionId)); $oActionButton->SetTooltip(Dict::S($sActionId));
} }
$oActionsBlock->AddSubBlock($oActionButton); $oActionsToolbar->AddSubBlock($oActionButton);
} }
if (!$oPage->IsPrintableVersion() && ($sRefreshAction != '')) { if ($sRefreshAction != '') {
$oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh'); $oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh');
$oActionButton->SetIconClass('fas fa-sync') $oActionButton->SetIconClass('fas fa-sync')
->SetOnClickJsCode($sRefreshAction) ->SetOnClickJsCode($sRefreshAction)
->SetTooltip(Dict::S('UI:Button:Refresh')) ->SetTooltip(Dict::S('UI:Button:Refresh'))
->AddCSSClass('ibo-action-button'); ->AddCSSClass('ibo-action-button');
$oActionsBlock->AddSubBlock($oActionButton); $oActionsToolbar->AddSubBlock($oActionButton);
} }
if ($this->m_sStyle == 'details') { if ($this->m_sStyle == 'details') {
$oActionButton = ButtonUIBlockFactory::MakeIconLink('fas fa-search', Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), "{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}", '','UI:SearchFor_Class'); $oActionButton = ButtonUIBlockFactory::MakeIconLink('fas fa-search', Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), "{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}", '', 'UI:SearchFor_Class');
$oActionButton->AddCSSClass('ibo-action-button'); $oActionButton->AddCSSClass('ibo-action-button');
$oActionsBlock->AddSubBlock($oActionButton); $oActionsToolbar->AddSubBlock($oActionButton);
} }
if (!empty($aActions)) {
if (count($aFavoriteActions) > 0) { if (!empty($aTransitionActions)) {
$sName = 'UI:Menu:OtherActions'; $sName = 'UI:Menu:Transitions';
} else { $oActionButton = ButtonUIBlockFactory::MakeIconAction('fas fa-map-signs', Dict::S($sName), $sName, '', false, $sTransitionActionsMenuTogglerId)
$sName = 'UI:Menu:Actions'; ->AddCSSClass('ibo-action-button')
}
$oActionButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', Dict::S($sName), $sName, '', false, $sMenuTogglerId);
// TODO Add Js
$oActionsBlock->AddSubBlock($oActionButton)
->AddSubBlock($oPage->GetPopoverMenu($sPopoverMenuId, $aActions));
$oActionButton->AddCSSClass('ibo-action-button')
->SetJsCode(<<<JS ->SetJsCode(<<<JS
$("#{$sPopoverMenuId}").popover_menu({toggler: "#{$sMenuTogglerId}"}); $("#{$sTransitionActionsPopoverMenuId}").popover_menu({toggler: "#{$sTransitionActionsMenuTogglerId}"});
$('#{$sMenuTogglerId}').on('click', function(oEvent) { $('#{$sTransitionActionsMenuTogglerId}').on('click', function(oEvent) {
var oEventTarget = $('#{$sMenuTogglerId}'); var oEventTarget = $('#{$sTransitionActionsMenuTogglerId}');
var aEventTargetPos = oEventTarget.position(); var aEventTargetPos = oEventTarget.position();
var popover = $("#{$sPopoverMenuId}"); var popover = $("#{$sTransitionActionsPopoverMenuId}");
popover.css({ popover.css({
'top': (aEventTargetPos.top + oEventTarget.outerHeight(true)) + 'px', 'top': (aEventTargetPos.top + oEventTarget.outerHeight(true)) + 'px',
@@ -2235,6 +2249,40 @@ $('#{$sMenuTogglerId}').on('click', function(oEvent) {
}); });
JS JS
); );
// TODO 3.0.0: Try to handle the JS above in a nicer place or through block options
$oActionsToolbar->AddSubBlock($oActionButton)
->AddSubBlock($oPage->GetPopoverMenu($sTransitionActionsPopoverMenuId, $aTransitionActions));
}
if (!empty($aRegularActions)) {
if (count($aFavoriteActions) > 0) {
$sName = 'UI:Menu:OtherActions';
} else {
$sName = 'UI:Menu:Actions';
}
$oActionButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', Dict::S($sName), $sName, '', false, $sRegularActionsMenuTogglerId)
->AddCSSClass('ibo-action-button')
->SetJsCode(<<<JS
$("#{$sRegularActionsPopoverMenuId}").popover_menu({toggler: "#{$sRegularActionsMenuTogglerId}"});
$('#{$sRegularActionsMenuTogglerId}').on('click', function(oEvent) {
var oEventTarget = $('#{$sRegularActionsMenuTogglerId}');
var aEventTargetPos = oEventTarget.position();
var popover = $("#{$sRegularActionsPopoverMenuId}");
popover.css({
'top': (aEventTargetPos.top + oEventTarget.outerHeight(true)) + 'px',
'left': (aEventTargetPos.left + oEventTarget.outerWidth(true) - popover.width()) + 'px',
'z-index': 10060
});
popover.popover_menu("togglePopup");
});
JS
);
// TODO 3.0.0: Try to handle the JS above in a nicer place or through block options
$oActionsToolbar->AddSubBlock($oActionButton)
->AddSubBlock($oPage->GetPopoverMenu($sRegularActionsPopoverMenuId, $aRegularActions));
} }
} }

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -487,6 +487,7 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Loading' => 'Loading...', 'UI:Loading' => 'Loading...',
'UI:Menu:Actions' => 'Actions', 'UI:Menu:Actions' => 'Actions',
'UI:Menu:OtherActions' => 'Other Actions', 'UI:Menu:OtherActions' => 'Other Actions',
'UI:Menu:Transitions' => 'Transitions',
'UI:Menu:New' => 'New...', 'UI:Menu:New' => 'New...',
'UI:Menu:Add' => 'Add...', 'UI:Menu:Add' => 'Add...',
'UI:Menu:Manage' => 'Manage...', 'UI:Menu:Manage' => 'Manage...',