diff --git a/app/Config/Routes.php b/app/Config/Routes.php index fa8a2f2..0eb6a56 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -106,7 +106,7 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->post('batchjob', 'HPILOController::batchjob'); $routes->get('console/(:num)', 'HPILOController::console/$1'); $routes->get('reset/(:num)/(:alpha)', 'HPILOController::reset/$1/$2'); - $routes->get('reload/(:num)', 'HPILOController::reset/$1'); + $routes->get('reload/(:num)', 'HPILOController::reload/$1'); }); }); /* diff --git a/app/Config/Routes_HPILO.php b/app/Config/Routes_HPILO.php index fa8a2f2..0eb6a56 100644 --- a/app/Config/Routes_HPILO.php +++ b/app/Config/Routes_HPILO.php @@ -106,7 +106,7 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->post('batchjob', 'HPILOController::batchjob'); $routes->get('console/(:num)', 'HPILOController::console/$1'); $routes->get('reset/(:num)/(:alpha)', 'HPILOController::reset/$1/$2'); - $routes->get('reload/(:num)', 'HPILOController::reset/$1'); + $routes->get('reload/(:num)', 'HPILOController::reload/$1'); }); }); /* diff --git a/app/Controllers/Admin/HPILOController.php b/app/Controllers/Admin/HPILOController.php index c2628c1..dae0b10 100644 --- a/app/Controllers/Admin/HPILOController.php +++ b/app/Controllers/Admin/HPILOController.php @@ -2,7 +2,6 @@ namespace App\Controllers\Admin; -use App\Libraries\Log\Log; use App\Models\HPILOModel; use App\Entities\HPILOEntity; use CodeIgniter\HTTP\RequestInterface; diff --git a/app/Language/kr/Admin/HPILO.php b/app/Language/kr/Admin/HPILO.php new file mode 100644 index 0000000..01e17a3 --- /dev/null +++ b/app/Language/kr/Admin/HPILO.php @@ -0,0 +1,23 @@ + "HPILO 정보", + 'label' => [ + 'uid' => "번호", + 'customer' => "서버명", + 'ip' => "ILO IP", + 'port' => "ILO Port", + 'id' => "ILO ID", + 'passwd' => "ILO 암호", + 'confirmpassword' => "암호확인", + 'model' => "Model", + 'processor' => "CPU*갯수", + 'memory' => "Memory", + 'health' => "부품상태", + 'power' => "전원상태", + 'detail' => "상세내용", + 'status' => "상태", + 'updated_at' => "수정일", + 'created_at' => "작성일" + ], + "STATUS" => FORM_OPTIONS['STATUS'], +]; diff --git a/app/Models/HPILOModel.php b/app/Models/HPILOModel.php index 14f9180..9f11c9c 100644 --- a/app/Models/HPILOModel.php +++ b/app/Models/HPILOModel.php @@ -15,14 +15,14 @@ class HPILOModel extends BaseModel } public function getFields(string $action = ""): array { - $fields = ['customer', 'id', 'passwd', 'ip', 'port', 'status']; + $fields = ['customer', 'ip', 'port', 'id', 'passwd', 'status']; switch ($action) { case "index": case "excel": - return ['customer', 'ip', 'port', 'model', 'processor', 'memory', 'health', 'power', 'status', 'created_at']; + return ['customer', 'ip', 'port', 'model', 'processor', 'memory', 'health', 'status', 'created_at']; break; case "view": - return ['customer', 'id', 'ip', 'port', 'model', 'processor', 'memory', 'health', 'power', 'detail', 'status', 'updated_at', 'created_at']; + return ['customer', 'ip', 'port', 'id', 'model', 'processor', 'memory', 'health', 'power', 'detail', 'status', 'updated_at', 'created_at']; break; default: return $fields; @@ -40,6 +40,15 @@ class HPILOModel extends BaseModel $rules[$field] = "required|trim|string"; $rules[$field] .= $action == "insert" ? "|is_unique[{$this->table}.{$field}]" : ""; break; + case "ip": + $rules[$field] = "required|valid_ip[ipv4]"; + break; + case "port": + $rules[$field] = "required|numeric"; + break; + case "id": + $rules[$field] = "required|string"; + break; case "passwd": $rules[$field] = "required|trim|string"; $rules["confirmpassword"] = "required|trim|string|matches[passwd]"; @@ -50,7 +59,7 @@ class HPILOModel extends BaseModel case "health": case "power": case "detail": - $rules[$field] = "required|string"; + $rules[$field] = "required|string"; break; default: $rules = parent::getFieldRule($field, $rules, $action); diff --git a/app/Views/layouts/admin/left_menu.php b/app/Views/layouts/admin/left_menu.php index a6fb54c..1ce48b4 100644 --- a/app/Views/layouts/admin/left_menu.php +++ b/app/Views/layouts/admin/left_menu.php @@ -5,6 +5,7 @@