fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix type error when unlinked menu creation fails

Browse source 
https://xetown.com/questions/1793779
이 문제의 1차적인 원인으로 추정되나, unlinked 메뉴 정보를 가져오지 못하는
근본적인 원인은 알 수 없음. 디버깅 편의를 위해 BaseObject 반환하도록 조치함.

메뉴를 통하지 않고 추가된 모듈들을 unlinked에 모아 두는 방식은
분명 개선할 필요가 있음.
This commit is contained in:
Kijin Sung 2023-11-08 22:51:06 +09:00
parent 2c0589ce4b
commit 290f467ddd
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/menu/menu.admin.controller.php
View file

@ -116,12 +116,20 @@ class MenuAdminController extends Menu
$unlinked_modules = $output->data; $unlinked_modules = $output->data;
} }
if($unlinked_modules) if ($unlinked_modules)
{ {
$unlinked_menu_srl = $this->getUnlinkedMenu(); $unlinked_menu_srl = $this->getUnlinkedMenu();
$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl); if ($unlinked_menu_srl instanceof BaseObject && !$unlinked_menu_srl->toBool())
{
return $unlinked_menu_srl;
}
else
{
return $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
}
} }
return new BaseObject();
} }
function getUnlinkedMenu() function getUnlinkedMenu()
@ -152,7 +160,7 @@ class MenuAdminController extends Menu
} }
else else
{ {
return false; return $output;
} }
} }

6
modules/menu/menu.admin.view.php
View file

@ -38,7 +38,11 @@ class MenuAdminView extends Menu
if($site_srl == 0) if($site_srl == 0)
{ {
$oMenuController = getAdminController('menu'); $oMenuController = getAdminController('menu');
$oMenuController->linkAllModuleInstancesToSitemap(); $output = $oMenuController->linkAllModuleInstancesToSitemap();
if (!$output->toBool())
{
return $output;
}
} }
// get installed module list // get installed module list