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

This commit is contained in:
Benjamin Dalsass
2024-02-21 10:48:22 +01:00

View File

@@ -2253,7 +2253,15 @@ EOF
$oXMLDoc->save($sTempTargetDir.'/'.$sFileName);
$aParameters['definition_file'] = "'".str_replace("'", "\\'", $sFileName)."'";
}
} else {
} else if($sAttType == 'AttributeClass'){
$this->CompileCommonProperty('sql', $oField, $aParameters, $sModuleRelativeDir);
$this->CompileCommonProperty('is_null_allowed', $oField, $aParameters, $sModuleRelativeDir, false);
$this->CompileCommonProperty('default_value', $oField, $aParameters, $sModuleRelativeDir, '');
$this->CompileCommonProperty('allowed_values', $oField, $aParameters, $sModuleRelativeDir);
$aParameters['class_category'] = $this->GetPropString($oField, 'class_category');
$aParameters['more_values'] = $this->GetPropString($oField, 'more_values');
$aParameters['depends_on'] = $sDependencies;
}else {
$this->CompileCommonProperty('sql', $oField, $aParameters, $sModuleRelativeDir);
$this->CompileCommonProperty('is_null_allowed', $oField, $aParameters, $sModuleRelativeDir, false);
$this->CompileCommonProperty('default_value', $oField, $aParameters, $sModuleRelativeDir, '');