From c080d30e92650c4cd97904fdc92c41cfa22c0c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Thu, 22 May 2025 17:02:17 +0900
Subject: [PATCH] dbms_init...1

---
 app/Controllers/Admin/Equipment/EquipmentController.php | 2 ++
 app/Controllers/Admin/MyLogController.php               | 1 -
 app/Controllers/CommonController.php                    | 8 +++++---
 app/Views/admin/popup/index.php                         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Admin/Equipment/EquipmentController.php b/app/Controllers/Admin/Equipment/EquipmentController.php
index 35dbc82..95ebdca 100644
--- a/app/Controllers/Admin/Equipment/EquipmentController.php
+++ b/app/Controllers/Admin/Equipment/EquipmentController.php
@@ -54,6 +54,7 @@ abstract class EquipmentController extends AdminController
                 }
                 $options[$field] = $temps;
                 // dd($options);
+                break;
             case 'lineinfo_uid':
                 $temps = [];
                 foreach ($this->getLineService()->getEntities() as $entity) {
@@ -61,6 +62,7 @@ abstract class EquipmentController extends AdminController
                 }
                 $options[$field] = $temps;
                 // dd($options);
+                break;
             default:
                 $options = parent::getFormFieldOption($field, $options);
                 break;
diff --git a/app/Controllers/Admin/MyLogController.php b/app/Controllers/Admin/MyLogController.php
index d316855..30a02b6 100644
--- a/app/Controllers/Admin/MyLogController.php
+++ b/app/Controllers/Admin/MyLogController.php
@@ -54,7 +54,6 @@ class MyLogController extends AdminController
                     $temps[$entity->getPK()] = $entity->getTitle();
                 }
                 $options[$field] = $temps;
-                // dd($options);
                 break;
             default:
                 $options = parent::getFormFieldOption($field, $options);
diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
index b270538..e80ec05 100644
--- a/app/Controllers/CommonController.php
+++ b/app/Controllers/CommonController.php
@@ -111,7 +111,7 @@ abstract class CommonController extends BaseController
     {
         switch ($field) {
             default:
-                $options = lang($this->getService()->getClassPath() . '.' . strtoupper($field));
+                $options[$field] = lang($this->getService()->getClassPath() . '.' . strtoupper($field));
                 break;
         }
         if (!is_array($options)) {
@@ -125,7 +125,10 @@ abstract class CommonController extends BaseController
             if (is_array($field)) {
                 throw new \Exception(__FUNCTION__ . "에서 field array 입니다.\n" . var_export($field, true));
             }
-            $options[$field] = $this->getFormFieldOption($field, $options);
+            if (!array_key_exists($field, $options)) {
+                $options[$field] = [];
+            }
+            $options = $this->getFormFieldOption($field, $options);
         }
         // dd($options);
         return $options;
@@ -170,7 +173,6 @@ abstract class CommonController extends BaseController
             case 'modify_form':
             case 'index':
             case 'view':
-                // dd($this->getViewDatas());
                 $this->getHelper()->setViewDatas($this->getViewDatas());
                 $result = view($this->view_path . $action, ['viewDatas' => $this->getViewDatas()]);
                 break;
diff --git a/app/Views/admin/popup/index.php b/app/Views/admin/popup/index.php
index 97e850e..a678ec8 100644
--- a/app/Views/admin/popup/index.php
+++ b/app/Views/admin/popup/index.php
@@ -1,6 +1,6 @@
 <?= $this->extend(LAYOUTS[$viewDatas['layout']]['path']) ?>
 <?= $this->section('content') ?>
-<?php if ($error = session('error')): ?><?= $viewDatas['helper']->alert($error) ?><?php endif ?>
+<?php if ($error = session('error')): ?><div style="border:1px solid red;"><?= $error ?></div><?php endif ?>
 <!-- Layout Right Start -->
 <div id="container" class="layout_content">
   <link href="/css/<?= $viewDatas['layout'] ?>/index.css" media="screen" rel="stylesheet" type="text/css" />