fix module install, add filters to msc, fix primary btn

This commit is contained in:
2024-12-19 12:59:27 +03:00
parent 1cf2dc3d86
commit a71102eb05
5 changed files with 66 additions and 6 deletions

View File

@ -308,7 +308,12 @@ class ModuleService
$manifest = Manifest::getWithVars($manifestJson);
$fileHelper = new Files();
$fileHelper->copy_folder($tmpModuleDirFull . 'app', $manifest['app_module_path']);
if (isset($manifest['app_module_path'])) {
$fileHelper->copy_folder($tmpModuleDirFull . 'app', $manifest['app_module_path']);
} else {
$fileHelper->copy_folder($tmpModuleDirFull . 'app', APP_DIR . '/modules/' . $manifest['slug']);
}
if (isset($manifest['kernel_module_path'])) {
$fileHelper->copy_folder($tmpModuleDirFull . 'kernel', $manifest['kernel_module_path']);
} else {
@ -316,6 +321,7 @@ class ModuleService
}
$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
unlink(ROOT_DIR . $path);
return true;
}
@ -392,8 +398,12 @@ class ModuleService
$manifest = Manifest::getWithVars($manifestJson);
$fileHelper = new Files();
if (isset($manifest['app_module_path'])) {
$fileHelper->copy_folder($tmpModuleDirFull . 'app/manifest.json', $manifest['app_module_path'] . '/manifest.json');
} else {
$fileHelper->copy_folder($tmpModuleDirFull . 'app/manifest.json', APP_DIR . '/modules/' . $manifest['slug'] . '/manifest.json');
}
$fileHelper->copy_folder($tmpModuleDirFull . 'app/manifest.json', $manifest['app_module_path'] . '/manifest.json');
if (isset($manifest['kernel_module_path'])) {
$fileHelper->copy_folder($tmpModuleDirFull . 'kernel', $manifest['kernel_module_path']);
} else {
@ -401,6 +411,8 @@ class ModuleService
}
$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
unlink(ROOT_DIR . $path);
return true;
}