composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-03 20:38:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8908 Warn user that an extension is part of package

Browse Source
This commit is contained in:
Timmy38
2026-07-30 10:55:01 +02:00
parent e0dc1fa571
commit 899f87f163
1 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
setup/wizardsteps/WizStepModulesChoice.php
View File

@@ -49,6 +49,7 @@ class WizStepModulesChoice extends AbstractWizStepInstall
protected bool $bChoicesFromDatabase;
private array $aAnalyzeInstallationModules = [];
private ?array $aBasePackageModules = null;
private ?MissingDependencyException $oMissingDependencyException = null;
public function __construct(WizardController $oWizard, $sCurrentState, bool $bOverWriteConfig = true)
@@ -752,6 +753,7 @@ EOF
$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']);
$bInstalled = $bMissingFromDisk || $oITopExtension?->bInstalled ?? false;
$bDependencyIssue = $oITopExtension?->HasDependencyIssue() ?? false;
file_put_contents('C:/tmp/compute_choice_flags.log', "mandatory for ".$aChoice['extension_code']."=".(int)$bMandatory."\n", FILE_APPEND);
$bChecked = $bSelected;
$bDisabled = false;
@@ -898,6 +900,9 @@ EOF
if (isset($aChoice['version']) && isset($aChoice['source_label'])) {
$sMetadata = '<span>v'.$aChoice['version'].'</span><span>'.$aChoice['source_label'].'</span>';
}
if ($this->IsIncludedInBasePackage($aChoice)) {
$sMetadata .= '<span>Included in package</span>';
}
$sChoiceDisabled = $aFlags['disabled'] && !$aFlags['checked'] ? 'choice-disabled' : '';
$oPage->add('
@@ -937,6 +942,71 @@ EOF
return $sSourceDir.'/installation.xml';
}
private function GetBasePackageModules(): array
{
if ($this->aBasePackageModules !== null) {
return $this->aBasePackageModules;
}
$this->aBasePackageModules = [];
$sSourceDir = $this->NormalizePath($this->oWizard->GetParameter('source_dir', ''));
echo "<pre>";
foreach ($this->aAnalyzeInstallationModules as $sModuleId => $aModuleInfo) {
var_dump($sModuleId);
if ($sModuleId === ROOT_MODULE) {
continue;
}
$sRootDir = $aModuleInfo['root_dir'] ?? '';
var_dump($sRootDir);
if ($sRootDir === '') {
continue;
}
$sModuleRootDir = $this->NormalizePath($sRootDir);
if (($sSourceDir !== '') && utils::StartsWith($sModuleRootDir, $sSourceDir)) {
$this->aBasePackageModules[$sModuleId] = true;
}
}
echo "</pre>";
return $this->aBasePackageModules;
}
private function IsIncludedInBasePackage(array $aChoice): bool
{
$sExtensionCode = $aChoice['extension_code'] ?? '';
if ($sExtensionCode === '') {
return false;
}
$oExtension = $this->oExtensionsMap->GetFromExtensionCode($sExtensionCode);
if (($oExtension === null) || ($oExtension->sSource === iTopExtension::SOURCE_WIZARD)) {
return false;
}
$aModules = $aChoice['modules'] ?? [];
if (!is_array($aModules) || empty($aModules)) {
return false;
}
$aBasePackageModules = $this->GetBasePackageModules();
foreach ($aModules as $sModuleId) {
if (!array_key_exists($sModuleId, $aBasePackageModules)) {
return false;
}
}
return true;
}
private function NormalizePath(string $sPath): string
{
return rtrim(str_replace('\\', '/', $sPath), '/');
}
public function CanMoveForward()
{
return true;