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

Customer portal : Browse Brick : Secondary actions menu was not always opening over the right element.

Browse Source 
SVN:trunk[4178]
This commit is contained in:
Guillaume Lajarige
2016-06-02 15:06:45 +00:00
parent 10ca60893b
commit 2c5d95a638
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
View File

@@ -54,7 +54,14 @@
var drilldownActionIndex; var drilldownActionIndex;
var levelPrimaryAction; var levelPrimaryAction;
var url = ''; var url = '';
var rowGlobalId = '';
// Preparing global row id
for(sLevelId in row)
{
rowGlobalId += ((rowGlobalId !== '') ? '-' : '') + row[sLevelId].id;
}
rowGlobalId = levelAltId + '_' + rowGlobalId;
// Preparing actions on the cell // Preparing actions on the cell
levelActions = oLevelsProperties[data.level_alias].actions; levelActions = oLevelsProperties[data.level_alias].actions;
// - Removing explicit (not default) drilldown action as it has no prupose on that browse mode // - Removing explicit (not default) drilldown action as it has no prupose on that browse mode
@@ -125,8 +132,8 @@
// Preparing secondary actions for small screens // Preparing secondary actions for small screens
if(bHasSeveralSecondaryActions) if(bHasSeveralSecondaryActions)
{ {
var actionsSSTogglerElem = $('<a class="glyphicon glyphicon-menu-hamburger" data-toggle="collapse" data-target="#item-actions-menu-'+levelAltId+'"></a>'); var actionsSSTogglerElem = $('<a class="glyphicon glyphicon-menu-hamburger" data-toggle="collapse" data-target="#item-actions-menu-'+rowGlobalId+'"></a>');
var actionsSSMenuElem = $('<div id="item-actions-menu-'+levelAltId+'" class="item-action-wrapper panel panel-default"></div>'); var actionsSSMenuElem = $('<div id="item-actions-menu-'+rowGlobalId+'" class="item-action-wrapper panel panel-default"></div>');
var actionsSSMenuContainerElem = $('<div class="panel-body"></div>'); var actionsSSMenuContainerElem = $('<div class="panel-body"></div>');
actionsSSMenuElem.append(actionsSSMenuContainerElem); actionsSSMenuElem.append(actionsSSMenuContainerElem);
actionsElem.append(actionsSSTogglerElem); actionsElem.append(actionsSSTogglerElem);