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

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

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/composer.json
This commit is contained in:
jf-cbd
2025-03-24 11:45:49 +01:00
parent fe913524fd c99995563e
commit 90370fce3b
37 changed files with 525 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
datamodels/2.x/itop-portal-base/portal/composer.json
View File

@@ -1,11 +1,16 @@
{
"license" : "AGPLv3",
"license": "AGPLv3",
"config" : {
"classmap-authoritative" : true
"autoloader-suffix": "Combodo_ItopPortalBase_Portal"
},
"autoload" : {
"psr-4" : {
"Combodo\\iTop\\Portal\\" : "src"
}
}
}
"autoload": {
"psr-4": {
"Combodo\\iTop\\Portal\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Combodo\\iTop\\Portal\\Tests\\": "tests/"
}
}
}

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)) {

2
datamodels/2.x/itop-portal-base/portal/vendor/autoload.php vendored
View File

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitd751713988987e9331980363e24189ce::getLoader();
return ComposerAutoloaderInitCombodo_ItopPortalBase_Portal::getLoader();

8
datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_real.php vendored
View File

@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd751713988987e9331980363e24189ce
class ComposerAutoloaderInitCombodo_ItopPortalBase_Portal
{
private static $loader;
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitd751713988987e9331980363e24189ce
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd751713988987e9331980363e24189ce', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitCombodo_ItopPortalBase_Portal', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitd751713988987e9331980363e24189ce', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitCombodo_ItopPortalBase_Portal', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitd751713988987e9331980363e24189ce::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitCombodo_ItopPortalBase_Portal::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);

8
datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php vendored
View File

@@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitd751713988987e9331980363e24189ce
class ComposerStaticInitCombodo_ItopPortalBase_Portal
{
public static $prefixLengthsPsr4 = array (
'C' =>
@@ -98,9 +98,9 @@ class ComposerStaticInitd751713988987e9331980363e24189ce
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd751713988987e9331980363e24189ce::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd751713988987e9331980363e24189ce::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd751713988987e9331980363e24189ce::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitCombodo_ItopPortalBase_Portal::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitCombodo_ItopPortalBase_Portal::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitCombodo_ItopPortalBase_Portal::$classMap;
}, null, ClassLoader::class);
}