Pārlūkot izejas kodu

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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4178 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 9 gadi atpakaļ
vecāks
revīzija
b138b6680c

+ 9 - 2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig

@@ -54,7 +54,14 @@
 						var drilldownActionIndex;
 						var levelPrimaryAction;
 						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
 						levelActions = oLevelsProperties[data.level_alias].actions;
 						// - 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
 								if(bHasSeveralSecondaryActions)
 								{
-									var actionsSSTogglerElem = $('<a class="glyphicon glyphicon-menu-hamburger" data-toggle="collapse" data-target="#item-actions-menu-'+levelAltId+'"></a>');
-									var actionsSSMenuElem = $('<div id="item-actions-menu-'+levelAltId+'" class="item-action-wrapper panel panel-default"></div>');
+									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-'+rowGlobalId+'" class="item-action-wrapper panel panel-default"></div>');
 									var actionsSSMenuContainerElem = $('<div class="panel-body"></div>');
 									actionsSSMenuElem.append(actionsSSMenuContainerElem);
 									actionsElem.append(actionsSSTogglerElem);