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

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

Browse Source 
# Conflicts:
#	core/log.class.inc.php
#	setup/modelfactory.class.inc.php
This commit is contained in:
Benjamin Dalsass
2022-06-08 12:38:41 +02:00
parent 834084a3e2 4c585614cd
commit f014ebfeb1
6 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/log.class.inc.php
View File

@@ -547,6 +547,7 @@ class LogChannels
/** /**
* @var string * @var string
* @since 3.0.1 N°4849 * @since 3.0.1 N°4849
* @since 2.7.7 N°4635
*/ */
public const NOTIFICATIONS = 'notifications'; public const NOTIFICATIONS = 'notifications';

19
datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
View File

@@ -132,25 +132,13 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
{ {
$aRet = parent::GetMFModulesToCompile($sSourceEnv, $sSourceDir); $aRet = parent::GetMFModulesToCompile($sSourceEnv, $sSourceDir);
// Add new mandatory modules // Add new mandatory modules from datamodel 2.x only
$sSourceDirFull = APPROOT.$sSourceDir; $sSourceDirFull = APPROOT.$sSourceDir;
if (!is_dir($sSourceDirFull)) if (!is_dir($sSourceDirFull))
{ {
throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)"); throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
} }
$aDirsToCompile = array($sSourceDirFull); $aDirsToCompile = [$sSourceDirFull];
if (is_dir(APPROOT.'extensions'))
{
$aDirsToCompile[] = APPROOT.'extensions';
}
$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
if (is_dir($sExtraDir))
{
$aDirsToCompile[] = $sExtraDir;
}
$aExtraDirs = $this->GetExtraDirsToScan($aDirsToCompile);
$aDirsToCompile = array_merge($aDirsToCompile, $aExtraDirs);
$oFactory = new ModelFactory($aDirsToCompile); $oFactory = new ModelFactory($aDirsToCompile);
$aModules = $oFactory->FindModules(); $aModules = $oFactory->FindModules();
@@ -159,10 +147,11 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
foreach ($aModules as $oModule) { foreach ($aModules as $oModule) {
$aAvailableModules[$oModule->GetName()] = $oModule; $aAvailableModules[$oModule->GetName()] = $oModule;
} }
// TODO check the auto-selected modules here
foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension) { foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension) {
if ($oExtension->bMarkedAsChosen) { if ($oExtension->bMarkedAsChosen) {
foreach ($oExtension->aModules as $sModuleName) { foreach ($oExtension->aModules as $sModuleName) {
if (!isset($aRet[$sModuleName])) { if (!isset($aRet[$sModuleName]) && isset($aAvailableModules[$sModuleName])) {
$aRet[$sModuleName] = $aAvailableModules[$sModuleName]; $aRet[$sModuleName] = $aAvailableModules[$sModuleName];
} }
} }

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

@@ -91,7 +91,7 @@ class ObjectFormManager extends FormManager
* @return array formmanager_data as a PHP array * @return array formmanager_data as a PHP array
* *
* @since 2.7.6 3.0.0 N°4384 method creation : factorize as this is used twice now * @since 2.7.6 3.0.0 N°4384 method creation : factorize as this is used twice now
* @since 2.7.7 3.0.1 only used once but kept * @since 2.7.7 3.0.1 N°4867 now only used once, but we decided to keep this method anyway
*/ */
protected static function DecodeFormManagerData($formManagerData) protected static function DecodeFormManagerData($formManagerData)
{ {

2
pages/ajax.searchform.php
View File

@@ -18,7 +18,7 @@ try
$oKPI->ComputeAndReport('Data model loaded'); $oKPI->ComputeAndReport('Data model loaded');
$oKPI = new ExecutionKPI(); $oKPI = new ExecutionKPI();
if (LoginWebPage::EXIT_CODE_OK != LoginWebPage::DoLoginEx(null /* any portal */, false, LoginWebPage::EXIT_RETURN)) if (LoginWebPage::EXIT_CODE_OK != LoginWebPage::DoLoginEx('backoffice', false, LoginWebPage::EXIT_RETURN))
{ {
throw new SecurityException('You must be logged in'); throw new SecurityException('You must be logged in');
} }

4
setup/modelfactory.class.inc.php
View File

@@ -961,9 +961,9 @@ class ModelFactory
catch (Exception $e) { catch (Exception $e) {
$aLoadedModuleNames = array(); $aLoadedModuleNames = array();
foreach (self::$aLoadedModules as $oLoadedModule) { foreach (self::$aLoadedModules as $oLoadedModule) {
$aLoadedModuleNames[] = $oLoadedModule->GetName(); $aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion();
} }
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',', throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(', ',
$aLoadedModuleNames)); $aLoadedModuleNames));
} }
} }

1
test/ItopDataTestCase.php
View File

@@ -785,6 +785,7 @@ class ItopDataTestCase extends ItopTestCase
// Create a specific organization for the tests // Create a specific organization for the tests
$oOrg = $this->CreateOrganization('UnitTestOrganization'); $oOrg = $this->CreateOrganization('UnitTestOrganization');
$this->iTestOrgId = $oOrg->GetKey(); $this->iTestOrgId = $oOrg->GetKey();
return $oOrg;
} }
/** /**