wixon/jongryangje
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: keep selected menu type while applying site fallback

Browse Source 
Preserve the selected site mt_idx in the UI and use a separate effective mt_idx for data fallback, so choosing site no longer appears as admin.

Made-with: Cursor
This commit is contained in:
taekyoungc
2026-04-08 17:29:40 +09:00
parent b99c108aeb
commit 6fddf15000
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Controllers/Admin/Menu.php
View File

@@ -32,20 +32,21 @@ class Menu extends BaseController
$types = $this->typeModel->orderBy('mt_sort', 'ASC')->findAll(); $types = $this->typeModel->orderBy('mt_sort', 'ASC')->findAll();
$requestedMtIdx = (int) ($this->request->getGet('mt_idx') ?? 0); $requestedMtIdx = (int) ($this->request->getGet('mt_idx') ?? 0);
$mtIdx = $this->resolveMtIdx($requestedMtIdx, $types); $mtIdx = $this->resolveMtIdx($requestedMtIdx, $types);
$effectiveMtIdx = $mtIdx;
$debugMode = $this->request->getGet('debug') === '1'; $debugMode = $this->request->getGet('debug') === '1';
$fallbackApplied = false; $fallbackApplied = false;
$list = $mtIdx > 0 ? $this->menuModel->getAllByType($mtIdx, $lgIdx) : []; $list = $effectiveMtIdx > 0 ? $this->menuModel->getAllByType($effectiveMtIdx, $lgIdx) : [];
$currentType = $mtIdx > 0 ? $this->typeModel->find($mtIdx) : null; $currentType = $mtIdx > 0 ? $this->typeModel->find($mtIdx) : null;
$currentTypeCode = (string) ($currentType->mt_code ?? ''); $currentTypeCode = (string) ($currentType->mt_code ?? '');
// 현재 지자체에 메뉴가 없으면, mt_idx별로 기본 지자체(lg_idx=1)의 메뉴를 한 번 복사한다. // 현재 지자체에 메뉴가 없으면, mt_idx별로 기본 지자체(lg_idx=1)의 메뉴를 한 번 복사한다.
if ($mtIdx > 0 && empty($list)) { if ($effectiveMtIdx > 0 && empty($list)) {
$this->menuModel->copyDefaultsFromLg($mtIdx, 1, $lgIdx); $this->menuModel->copyDefaultsFromLg($effectiveMtIdx, 1, $lgIdx);
$list = $this->menuModel->getAllByType($mtIdx, $lgIdx); $list = $this->menuModel->getAllByType($effectiveMtIdx, $lgIdx);
} }
// 운영 DB 불일치 대응: site 타입인데 mt_idx 매핑이 어긋난 경우(예: menu_type=2, menu는 4 사용) // 운영 DB 불일치 대응: site 타입인데 mt_idx 매핑이 어긋난 경우(예: menu_type=2, menu는 4 사용)
if (empty($list) && $currentTypeCode === 'site' && $mtIdx !== 4) { if (empty($list) && $currentTypeCode === 'site' && $effectiveMtIdx !== 4) {
$fallbackMtIdx = 4; $fallbackMtIdx = 4;
$fallbackList = $this->menuModel->getAllByType($fallbackMtIdx, $lgIdx); $fallbackList = $this->menuModel->getAllByType($fallbackMtIdx, $lgIdx);
if (empty($fallbackList)) { if (empty($fallbackList)) {
@@ -53,7 +54,7 @@ class Menu extends BaseController
$fallbackList = $this->menuModel->getAllByType($fallbackMtIdx, $lgIdx); $fallbackList = $this->menuModel->getAllByType($fallbackMtIdx, $lgIdx);
} }
if (! empty($fallbackList)) { if (! empty($fallbackList)) {
$mtIdx = $fallbackMtIdx; $effectiveMtIdx = $fallbackMtIdx;
$list = $fallbackList; $list = $fallbackList;
$fallbackApplied = true; $fallbackApplied = true;
} }
@@ -78,6 +79,7 @@ class Menu extends BaseController
'lg_idx' => $lgIdx, 'lg_idx' => $lgIdx,
'requested_mt_idx' => $requestedMtIdx, 'requested_mt_idx' => $requestedMtIdx,
'resolved_mt_idx' => $mtIdx, 'resolved_mt_idx' => $mtIdx,
'effective_mt_idx' => $effectiveMtIdx,
'resolved_mt_code' => $currentTypeCode, 'resolved_mt_code' => $currentTypeCode,
'list_count' => count($list), 'list_count' => count($list),
'fallback_applied' => $fallbackApplied ? 'Y' : 'N', 'fallback_applied' => $fallbackApplied ? 'Y' : 'N',

1
app/Views/admin/menu/index.php
View File

@@ -52,6 +52,7 @@ $adminMenuListResolveHref = static function (string $rawLink) use ($adminMenusNa
lg_idx=<?= esc((string) ($debugInfo['lg_idx'] ?? '')) ?>, lg_idx=<?= esc((string) ($debugInfo['lg_idx'] ?? '')) ?>,
requested_mt_idx=<?= esc((string) ($debugInfo['requested_mt_idx'] ?? '')) ?>, requested_mt_idx=<?= esc((string) ($debugInfo['requested_mt_idx'] ?? '')) ?>,
resolved_mt_idx=<?= esc((string) ($debugInfo['resolved_mt_idx'] ?? '')) ?>, resolved_mt_idx=<?= esc((string) ($debugInfo['resolved_mt_idx'] ?? '')) ?>,
effective_mt_idx=<?= esc((string) ($debugInfo['effective_mt_idx'] ?? '')) ?>,
resolved_mt_code=<?= esc((string) ($debugInfo['resolved_mt_code'] ?? '')) ?>, resolved_mt_code=<?= esc((string) ($debugInfo['resolved_mt_code'] ?? '')) ?>,
list_count=<?= esc((string) ($debugInfo['list_count'] ?? '')) ?>, list_count=<?= esc((string) ($debugInfo['list_count'] ?? '')) ?>,
fallback_applied=<?= esc((string) ($debugInfo['fallback_applied'] ?? 'N')) ?> fallback_applied=<?= esc((string) ($debugInfo['fallback_applied'] ?? 'N')) ?>