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

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

Browse Source 
# Conflicts:
#	css/backoffice/pages/_csv-import.scss
#	pages/ajax.render.php
This commit is contained in:
Benjamin Dalsass
2023-03-03 14:26:21 +01:00
parent a0483738bc 93c0b98eb7
commit 7ae86a8bf3
18 changed files with 242 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pages/ajax.render.php
View File

@@ -416,9 +416,10 @@ try
$iInputId = utils::ReadParam('iInputId', '');
$sAttCode = utils::ReadParam('sAttCode', '');
$sJson = utils::ReadParam('json', '', false, 'raw_data');
// Building form, if target class is abstract we ask the user for the desired leaf class
$bTargetClassSelected = utils::ReadParam('bTargetClassSelected', '', false, 'raw_data');
// Building form, if target class has child classes we ask the user for the desired leaf class, unless we've already done just that
$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
if (MetaModel::IsAbstract($sTargetClass)) {
if(!$bTargetClassSelected && MetaModel::HasChildrenClasses($sTargetClass)){
$oWidget->GetClassSelectionForm($oPage);
} else {
$aPrefillFormParam = array();