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

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

Browse Source 
# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
#	templates/pages/backoffice/oauth/Wizard.html.twig
This commit is contained in:
Benjamin Dalsass
2022-06-27 08:38:01 +02:00
parent 306e16147a 1b76e96720
commit 02dab4eb72
170 changed files with 2988 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/ajax.render.php
View File

@@ -562,7 +562,7 @@ try
if (!$oAttDef->IsWritable() || ($oWizardHelper->GetReturnNotEditableFields()))
{
// Even non-writable fields (like AttributeExternal) can be refreshed
$sHTMLValue = $oObj->GetAsHTML($sAttCode);
$sHTMLValue = "<div id=\"field_{$sId}\" class=\"field_value_container\"><div class=\"attribute-edit\" data-attcode=\"$sAttCode\">".$oObj->GetAsHTML($sAttCode)."</div></div>";
}
else
{