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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	composer.lock
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
This commit is contained in:
Pierre Goiffon
2022-06-28 15:16:41 +02:00
parent cb1203fde9 2392f4a902
commit 4a20a6e525
17 changed files with 433 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
View File

@@ -58,7 +58,7 @@ class PopupMenuExtension implements \iPopupMenuExtension
$sObjClass = get_class($oObj);
$aParams['class'] = $sObjClass;
$aParams['id'] = $oObj->GetKey();
$aParams['operation'] = 'CreateMailBox';
$aParams['operation'] = 'CreateMailbox';
$aResult[] = new URLPopupMenuItem(
$sMenu.' from '.$sObjClass,
Dict::S($sMenu),