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/master' into develop

Browse Source 
# Conflicts:
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
This commit is contained in:
Pierre Goiffon
2019-03-21 17:46:30 +01:00
parent 9bb365e60d cac0da4e3d
commit 2a0928b4be
31 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/metamodel.class.php
View File

@@ -635,7 +635,7 @@ abstract class MetaModel
* @param string $sRootClass
* @param string $sRuleId
*
* @return string[] child classes with the rule disabled
* @return string[] child classes with the rule disabled, and that are concrete classes
*
* @throws \CoreException
* @since 2.6.1 N°1968 (soyez réalistes, demandez l'impossible)
@@ -645,6 +645,10 @@ abstract class MetaModel
$aClassesWithDisabledRule = array();
foreach (self::EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_EXCLUDETOP) as $sChildClass)
{
if (array_key_exists($sChildClass, $aClassesWithDisabledRule))
{
continue;
}
if (!array_key_exists('uniqueness_rules', self::$m_aClassParams[$sChildClass]))
{
continue;
@@ -656,7 +660,14 @@ abstract class MetaModel
if (self::$m_aClassParams[$sChildClass]['uniqueness_rules'][$sRuleId]['disabled'] === true)
{
$aClassesWithDisabledRule[] = $sChildClass;
$aDisabledClassChildren = self::EnumChildClasses($sChildClass, ENUM_CHILD_CLASSES_ALL);
foreach ($aDisabledClassChildren as $sDisabledClassChild)
{
if (!self::IsAbstract($sDisabledClassChild))
{
$aClassesWithDisabledRule[] = $sDisabledClassChild;
}
}
}
}