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

N°5655 - Small refactor for better reading

Browse Source
This commit is contained in:
Molkobain
2022-12-02 18:09:40 +01:00
parent 4ac0de5fff
commit e5d67d2219
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1755,6 +1755,7 @@ class MenuBlock extends DisplayBlock
$sClass = $this->m_oFilter->GetClass(); $sClass = $this->m_oFilter->GetClass();
$oSet = new CMDBObjectSet($this->m_oFilter); $oSet = new CMDBObjectSet($this->m_oFilter);
$iSetCount = $oSet->Count();
$sRefreshAction = $aExtraParams['refresh_action'] ?? ''; $sRefreshAction = $aExtraParams['refresh_action'] ?? '';
/** @var array $aRegularActions Any action other than a transition */ /** @var array $aRegularActions Any action other than a transition */
@@ -1763,40 +1764,45 @@ class MenuBlock extends DisplayBlock
$aTransitionActions = []; $aTransitionActions = [];
/** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */ /** @var array $aToolkitActions Any "legacy" toolkit menu item, which are now displayed in the same menu as the $aRegularActions, after them */
$aToolkitActions = []; $aToolkitActions = [];
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();
if (!empty($sContext)) { if (utils::IsNotNullOrEmptyString($sContext)) {
$sContext = '&'.$sContext; $sContext = '&'.$sContext;
} }
$oReflectionClass = new ReflectionClass($sClass); $oReflectionClass = new ReflectionClass($sClass);
$sFilter = $this->m_oFilter->serialize(); $sFilter = $this->m_oFilter->serialize();
$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass); $sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
$sRootUrl = utils::GetAbsoluteUrlAppRoot(); $sRootUrl = utils::GetAbsoluteUrlAppRoot();
// Common params that will be applied to actions // Common params that will be applied to actions
$aActionParams = array(); $aActionParams = array();
if (isset($aExtraParams['menu_actions_target'])) { if (isset($aExtraParams['menu_actions_target'])) {
$aActionParams['target'] = $aExtraParams['menu_actions_target']; $aActionParams['target'] = $aExtraParams['menu_actions_target'];
} }
// 1:n links, populate the target object as a default value when creating a new linked object // 1:n links, populate the target object as a default value when creating a new linked object
if (isset($aExtraParams['target_attr'])) { if (isset($aExtraParams['target_attr'])) {
$aExtraParams['default'][$aExtraParams['target_attr']] = $aExtraParams['object_id']; $aExtraParams['default'][$aExtraParams['target_attr']] = $aExtraParams['object_id'];
} }
$sDefault = ''; /** @var string $sDefaultValuesAsUrlParams Default values for the object to create, already formatted as URL params (eg. "&default[org_id]=3&default[title]=Foo") */
$sDefaultValuesAsUrlParams = '';
if (!empty($aExtraParams['default'])) { if (!empty($aExtraParams['default'])) {
foreach ($aExtraParams['default'] as $sKey => $sValue) { foreach ($aExtraParams['default'] as $sKey => $sValue) {
$sDefault .= "&default[$sKey]=$sValue"; $sDefaultValuesAsUrlParams .= "&default[$sKey]=$sValue";
} }
} }
$bIsCreationAllowed = (UserRights::IsActionAllowed($sClass, $bIsCreationAllowed = (UserRights::IsActionAllowed($sClass,
UR_ACTION_CREATE) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject')); UR_ACTION_CREATE) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
switch ($oSet->Count()) { switch ($iSetCount) {
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) {
$aRegularActions['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}{$sDefaultValuesAsUrlParams}",
) + $aActionParams; ) + $aActionParams;
} }
break; break;
@@ -1808,7 +1814,7 @@ class MenuBlock extends DisplayBlock
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aRegularActions['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}{$sDefaultValuesAsUrlParams}",
) + $aActionParams; ) + $aActionParams;
} }
} }
@@ -1827,8 +1833,6 @@ class MenuBlock extends DisplayBlock
$aLockInfo = iTopOwnershipLock::IsLocked(get_class($oObj), $id); $aLockInfo = iTopOwnershipLock::IsLocked(get_class($oObj), $id);
if ($aLockInfo['locked']) { if ($aLockInfo['locked']) {
$bLocked = true; $bLocked = true;
//$this->AddMenuSeparator($aActions);
//$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, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject')); $bRawModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
@@ -1845,7 +1849,7 @@ class MenuBlock extends DisplayBlock
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aRegularActions['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}{$sDefaultValuesAsUrlParams}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsDeleteAllowed) { if ($bIsDeleteAllowed) {
@@ -1969,7 +1973,7 @@ class MenuBlock extends DisplayBlock
if ($bIsCreationAllowed) { if ($bIsCreationAllowed) {
$aRegularActions['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}{$sDefaultValuesAsUrlParams}",
) + $aActionParams; ) + $aActionParams;
} }
if ($bIsBulkModifyAllowed) { if ($bIsBulkModifyAllowed) {
@@ -2056,8 +2060,9 @@ class MenuBlock extends DisplayBlock
$sRefreshAction = "window.location.reload();"; $sRefreshAction = "window.location.reload();";
} }
} else { } else {
//it's easier just display configure this list and MENU_OBJLIST_TOOLKIT // It's easier just display configure this list and MENU_OBJLIST_TOOLKIT
} }
$param = null; $param = null;
if (is_null($sId)) { if (is_null($sId)) {
$sId = uniqid(); $sId = uniqid();
@@ -2089,6 +2094,7 @@ class MenuBlock extends DisplayBlock
break; break;
} }
if ($oPopupMenuItemsBlock->HasSubBlocks()) { if ($oPopupMenuItemsBlock->HasSubBlocks()) {
$oRenderBlock->AddSubBlock($oPopupMenuItemsBlock); $oRenderBlock->AddSubBlock($oPopupMenuItemsBlock);
} else { } else {
@@ -2099,6 +2105,7 @@ class MenuBlock extends DisplayBlock
$oRenderBlock->AddCssFileRelPath($sCssPath); $oRenderBlock->AddCssFileRelPath($sCssPath);
} }
} }
// Extract favorite actions from their menus // Extract favorite actions from their menus
$aFavoriteRegularActions = []; $aFavoriteRegularActions = [];
$aFavoriteTransitionActions = []; $aFavoriteTransitionActions = [];
@@ -2223,7 +2230,7 @@ class MenuBlock extends DisplayBlock
} }
// - Refresh // - Refresh
if ($sRefreshAction != '') { if (utils::IsNotNullOrEmptyString($sRefreshAction)) {
$oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh'); $oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh');
$oActionButton->SetIconClass('fas fa-sync-alt') $oActionButton->SetIconClass('fas fa-sync-alt')
->SetOnClickJsCode($sRefreshAction) ->SetOnClickJsCode($sRefreshAction)

7
application/utils.inc.php
View File

@@ -1410,12 +1410,14 @@ class utils
*/ */
public static function GetPopupMenuItemsBlock(iUIBlock &$oContainerBlock, $iMenuId, $param, &$aActions, $sDataTableId = null) public static function GetPopupMenuItemsBlock(iUIBlock &$oContainerBlock, $iMenuId, $param, &$aActions, $sDataTableId = null)
{ {
$aResult = [];
// 1st - add standard built-in menu items // 1st - add standard built-in menu items
// //
switch($iMenuId) switch($iMenuId)
{ {
case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT: case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
// $param is a DBObjectSet /** @var \DBObjectSet $param */
$oAppContext = new ApplicationContext(); $oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink(); $sContext = $oAppContext->GetForLink();
$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId; $sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
@@ -1453,7 +1455,7 @@ class utils
break; break;
case iPopupMenuExtension::MENU_OBJDETAILS_ACTIONS: case iPopupMenuExtension::MENU_OBJDETAILS_ACTIONS:
// $param is a DBObject /** @var \DBObject $param */
$oObj = $param; $oObj = $param;
$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey(); $sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey()); $sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
@@ -1502,7 +1504,6 @@ class utils
default: default:
// Unknown type of menu, do nothing // Unknown type of menu, do nothing
$aResult = array();
} }
foreach ($aResult as $oMenuItem) foreach ($aResult as $oMenuItem)
{ {

10
templates/base/components/datatable/layout.live.js.twig
View File

@@ -1,9 +1,9 @@
{% if oUIBlock.GetOption("select_mode") is not empty %} {% if oUIBlock.GetOption("select_mode") is not empty %}
var oSelectedItems{{ oUIBlock.GetOption('sListId') |sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = []; let oSelectedItems{{ oUIBlock.GetOption('sListId')|sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = [];
{% if oUIBlock.GetOption("sSelectedRows") is not empty %} {% if oUIBlock.GetOption("sSelectedRows") is not empty %}
oSelectedItems{{ oUIBlock.GetOption('sListId') |sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = {{ oUIBlock.GetOption('sSelectedRows')|raw }}; oSelectedItems{{ oUIBlock.GetOption('sListId')|sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = {{ oUIBlock.GetOption('sSelectedRows')|raw }};
{% endif %} {% endif %}
{% endif %} {% endif %}
var bSelectAllowed{{ oUIBlock.GetId()|sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = false; let bSelectAllowed{{ oUIBlock.GetId()|sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }} = false;