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

N°967 Portal: Browse brick actions are now correctly ordered even without a rank tag

Browse Source
This commit is contained in:
Stephen Abello
2019-09-19 10:53:42 +02:00
parent d83a256b9d
commit a8d5630030
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/itop-portal-base/portal/src/Brick/BrowseBrick.php
View File

@@ -128,12 +128,12 @@ class BrowseBrick extends PortalBrick
if($bIsAction1RankSet && $bIsAction2RankSet)
{
//If a1 == a2 return 0, if a1 > a2 return 1 else return -1
return ($aAction1['rank'] === $aAction2['rank'] ? 0 : ($aAction1['rank'] > $aAction2['rank'] ? 1 : -1));
return ($aAction1['rank'] === $aAction2['rank'] ? $aAction1['default_rank'] - $aAction2['default_rank'] : $aAction1['rank'] - $aAction2['rank']);
}
else
{
//If a1 == a2 == null return 0, if a2 is null and not a1 return 1 else return -1
return ($bIsAction1RankSet === $bIsAction2RankSet ? 0 : ($bIsAction1RankSet ? 1 : -1));
return ($bIsAction1RankSet === $bIsAction2RankSet ? $aAction1['default_rank'] - $aAction2['default_rank'] : ($bIsAction1RankSet ? 1 : -1));
}
}
@@ -515,6 +515,7 @@ class BrowseBrick extends PortalBrick
if ($oLevelPropertyNode->hasChildNodes())
{
$aLevel[$sTagName] = array();
$iActionDefaultRank = 0;
/** @var \Combodo\iTop\DesignElement $oActionNode */
foreach ($oLevelPropertyNode->childNodes as $oActionNode)
{
@@ -592,7 +593,7 @@ class BrowseBrick extends PortalBrick
null, null, $oRuleNode);
}
}
$aTmpAction['default_rank'] = $iActionDefaultRank++;
$aLevel[$sTagName][$oActionNode->getAttribute('id')] = $aTmpAction;
}
else