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

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

Browse Source 
# Conflicts:
#	core/restservices.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
This commit is contained in:
jf-cbd
2025-03-24 10:07:36 +01:00
parent 4a415fdb59 5232694c04
commit e49b8fc480
8 changed files with 548 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
View File

@@ -1238,15 +1238,17 @@ class ObjectFormManager extends FormManager
foreach ($aCurrentValues as $sAttCode => $value)
{
if (!array_key_exists($sAttCode, $this->aFieldsAtts)) {
continue;
}
$iAttributeFlags = $this->aFieldsAtts[$sAttCode];
if ($iAttributeFlags & OPT_ATT_HIDDEN) {
continue;
}
if ($iAttributeFlags & OPT_ATT_READONLY) {
continue;
if (count($this->aFieldsAtts) !== 0) {
if (!array_key_exists($sAttCode, $this->aFieldsAtts)) {
continue;
}
$iAttributeFlags = $this->aFieldsAtts[$sAttCode];
if ($iAttributeFlags & OPT_ATT_HIDDEN) {
continue;
}
if ($iAttributeFlags & OPT_ATT_READONLY) {
continue;
}
}
if (MetaModel::IsValidAttCode($sObjectClass, $sAttCode)) {