Update menu_srl of module to 0 if linked menu is deleted

This commit is contained in:
Kijin Sung 2023-06-25 18:18:23 +09:00
parent 1a65634413
commit e1b6e0e70d

View file

@ -206,7 +206,7 @@ class menuAdminController extends menu
$moduleInfo->menu_srl = $menuSrl; $moduleInfo->menu_srl = $menuSrl;
} }
$output = executeQuery('module.updateModule', $moduleInfo); ModuleController::getInstance()->updateModule($moduleInfo);
} }
Rhymix\Framework\Cache::clearGroup('site_and_module'); Rhymix\Framework\Cache::clearGroup('site_and_module');
@ -372,22 +372,28 @@ class menuAdminController extends menu
} }
// Delete linked module // Delete linked module
if ($delete_module) $oModuleController = ModuleController::getInstance();
foreach($output->data as $itemInfo)
{ {
$oModuleController = ModuleController::getInstance(); if ($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0)
foreach($output->data as $itemInfo)
{ {
if ($itemInfo->is_shortcut != 'Y' && strncasecmp('http', $itemInfo->url, 4) !== 0) $moduleInfo = ModuleModel::getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
if ($moduleInfo->module_srl)
{ {
$moduleInfo = ModuleModel::getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl); if ($delete_module)
if ($moduleInfo->module_srl)
{ {
$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl); $output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
if (!$output->toBool()) }
{ else
$oDB->rollback(); {
return $output; $moduleInfo->menu_srl = 0;
} $output = $oModuleController->updateModule($moduleInfo);
}
if (!$output->toBool())
{
$oDB->rollback();
return $output;
} }
} }
} }
@ -1003,7 +1009,7 @@ class menuAdminController extends menu
if($node['active_btn']) FileHandler::removeFile($node['active_btn']); if($node['active_btn']) FileHandler::removeFile($node['active_btn']);
// Delete module // Delete module
if($delete_module && $node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0) if($node['is_shortcut'] != 'Y' && strncasecmp('http', $node['url'], 4) !== 0)
{ {
// reference menu's url modify // reference menu's url modify
$args->url = $node['url']; $args->url = $node['url'];
@ -1026,7 +1032,16 @@ class menuAdminController extends menu
$moduleInfo = ModuleModel::getModuleInfoByMid($node['url'], $menuInfo->site_srl); $moduleInfo = ModuleModel::getModuleInfoByMid($node['url'], $menuInfo->site_srl);
if($moduleInfo->module_srl) if($moduleInfo->module_srl)
{ {
$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl); if ($delete_module)
{
$output = $oModuleController->onlyDeleteModule($moduleInfo->module_srl);
}
else
{
$moduleInfo->menu_srl = 0;
$output = $oModuleController->updateModule($moduleInfo);
}
if(!$output->toBool()) if(!$output->toBool())
{ {
$oDB->rollback(); $oDB->rollback();