diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 24f6bf0..6669bae 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -35,23 +35,22 @@ class UserController extends AdminController //Index,FieldForm관련 protected function getResultSuccess(string $message = MESSAGES["SUCCESS"], ?string $actionTemplate = null): RedirectResponse|string { - switch ($this->getService()->getAction()) { - case 'profile_modify_form': + switch ($this->getService()->getControlDatas('action')) { + case 'profile': + $result = $this->view($this->entity->getPK()); + break; + case 'profile_form': $this->service = $this->getService(); $this->control = $this->getService()->getControlDatas(); $this->getService()->getHelper()->setViewDatas($this->getViewDatas()); $actionTemplate = $this->request->getVar('ActionTemplate') ?? $actionTemplate; if ($actionTemplate) { - $view_file = $this->view_path . $actionTemplate . DIRECTORY_SEPARATOR . 'modify_form'; + $view_file = $this->view_path . $actionTemplate . DIRECTORY_SEPARATOR . "modify_form"; } else { - $view_file = $this->view_path . 'modify_form'; + $view_file = $this->view_path . "modify_form"; } $result = view($view_file, ['viewDatas' => $this->getViewDatas()]); break; - case 'profile_modify': - $this->getMyLogService()->save($this->getService()->getClassName(), $this->getService()->getAction(), $message, $this->getMyAuth()->getUIDByAuthInfo()); - $result = $this->view($this->entity->getPK()); - break; default: $result = parent::getResultSuccess($message, $actionTemplate); break; diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 9d26767..93eb737 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -108,7 +108,6 @@ abstract class CommonController extends BaseController switch ($this->getService()->getControlDatas('action')) { case 'create': case 'modify': - // $this->getMyLogService()->save($this->getService()->getClassName(), $this->getAction(), $message, $this->getMyAuth()->getUIDByAuthInfo()); $result = $this->view($this->entity->getPK()); break; case 'create_form': diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 8c8852f..a2aac79 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -429,14 +429,14 @@ class CommonHelper { switch ($action) { case 'create': - $extras = ["class" => "btn btn-outline btn-primary btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : '입력', $action, [ "data-src" => current_url() . '/' . $action . '?' . $viewDatas['uri']->getQuery(), "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", ...$extras ] ); @@ -457,44 +457,48 @@ class CommonHelper [ "data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $viewDatas['uri']->getQuery(), "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", 'class' => 'form-label-sm', ...$extras ] ); break; case 'view': - $extras = ["class" => "btn btn-outline btn-primary btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['SEARCH'], $action, [ "data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $viewDatas['uri']->getQuery(), "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", ...$extras ] ); break; case 'delete': - $extras = ["class" => "btn btn-sm btn-danger btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = anchor( current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK(), $label ? $label : ICONS['DELETE'], - $extras + [ + "class" => "btn btn-sm btn-danger form-label-sm", + ...$extras + ] ); break; case 'batchjob': $action = form_submit("batchjob_submit", $label ? $label : '일괄처리', [ "formaction" => current_url() . '/batchjob', - "class" => "btn btn-outline btn-warning", + "class" => "btn btn-sm btn-warning form-label-sm", + ...$extras, // "onclick" => "return submitBatchJob()" ]); break; case 'batchjob_delete': $action = form_submit("batchjob_submit", $label ? $label : '일괄삭제', [ "formaction" => current_url() . '/batchjob_delete', - "class" => "btn btn-outline btn-danger", + "class" => "btn btn-sm btn-danger form-label-sm", + ...$extras, // "onclick" => "return submitBatchJobDelete()" ]); break; diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index 03434dd..f4ad12f 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -22,41 +22,41 @@ class ClientHelper extends CustomerHelper $value = $this->getMyAuth()->isAccessRole(['security']) ? parent::getFieldView($field, $value, $viewDatas, $extras) : "***********"; break; case 'account_balance': - $extras = ["class" => "btn btn-link form-label-sm", "target" => "_self", ...$extras]; $value = form_label( number_format(intval($value)) . "원", 'index', [ "data-src" => "/admin/customer/account?clientinfo_uid={$viewDatas['entity']->getPK()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", + ...$extras, ] ); break; case 'coupon_balance': - $extras = ["class" => "btn btn-link form-label-sm", "target" => "_self", ...$extras]; $value = form_label( number_format(intval($value)) . "개", 'index', [ "data-src" => "/admin/customer/coupon?clientinfo_uid={$viewDatas['entity']->getPK()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", + ...$extras, ] ); break; case 'point_balance': - $extras = ["class" => "btn btn-link form-label-sm", "target" => "_self", ...$extras]; $value = form_label( number_format(intval($value)) . "원", 'index', [ "data-src" => "/admin/customer/point?clientinfo_uid={$viewDatas['entity']->getPK()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", + ...$extras, ] ); break; @@ -82,14 +82,14 @@ class ClientHelper extends CustomerHelper $action = $this->getMyAuth()->isAccessRole(['security']) ? parent::getListButton($action, $label, $viewDatas, $extras) : ""; break; case 'history': - $extras = ["class" => "btn btn-outline btn-primary btn-circle", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['HISTORY'], $action, [ "data-src" => "/admin/customer/client/history?clientinfo_uid={$viewDatas['entity']->getPK()}", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", ...$extras ] ); @@ -97,19 +97,15 @@ class ClientHelper extends CustomerHelper case 'coupon': case 'account': case 'point': - $extras = [ - "class" => "btn btn-sm btn-outline btn-circle btn-link form-label-sm", - "target" => "_self", - ...$extras, - ]; $action = form_label( $label, $action, [ "data-src" => "/admin/customer/{$action}?clientinfo_uid={$viewDatas['entity']->getPK()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras, + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", + ...$extras ] ); break; diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 23e5713..fa04599 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -107,40 +107,40 @@ class ServiceHelper extends CustomerHelper $action = parent::getListButton($action, $label, $viewDatas, $extras); break; case 'addServer': - $extras = ["class" => "btn btn-outline btn-light btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['REBOOT'], $action, [ "data-src" => "/admin/customer/service/addServer/{$viewDatas['entity']->getPK()}", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm", ...$extras ] ); break; case 'onetime': - $extras = ["class" => "btn btn-outline btn-light btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['ONETIME'], $action, [ "data-src" => "/admin/customer/payment/create?serviceinfo_uid={$viewDatas['entity']->getPK()}", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm", ...$extras ] ); break; case 'history': - $extras = ["class" => "btn btn-outline btn-primary btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['HISTORY'], $action, [ "data-src" => "/admin/customer/service/history?serviceinfo_uid={$viewDatas['entity']->getPK()}&serviceinfo_uid={$viewDatas['entity']->getPK()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", ...$extras ] ); diff --git a/app/Helpers/Equipment/ServerHelper.php b/app/Helpers/Equipment/ServerHelper.php index 5e94b84..7728a9a 100644 --- a/app/Helpers/Equipment/ServerHelper.php +++ b/app/Helpers/Equipment/ServerHelper.php @@ -84,14 +84,14 @@ class ServerHelper extends EquipmentHelper $action = parent::getListButton($action, $viewDatas['entity']->getCode(), $viewDatas, $extras); break; case 'history': - $extras = ["class" => "btn btn-outline btn-primary btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = $label ? $label : form_label( $label ? $label : ICONS['HISTORY'], $action, [ "data-src" => "/admin/customer/clienthistory?clientinfo_uid={$viewDatas['entity']->getPK()}", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm btn-primary form-label-sm", ...$extras ] ); diff --git a/app/Helpers/Equipment/ServerPartHelper.php b/app/Helpers/Equipment/ServerPartHelper.php index 79193f6..b0a1d56 100644 --- a/app/Helpers/Equipment/ServerPartHelper.php +++ b/app/Helpers/Equipment/ServerPartHelper.php @@ -85,9 +85,9 @@ class ServerPartHelper extends EquipmentHelper [ "data-src" => "/admin/equipment/server/modify/{$viewDatas['serverEntity']->getPK()}?ActionTemplate=server", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - "class" => "btn btn-sm btn-outline btn-circle form-label-sm", - "target" => "_self", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", + ...$extras, ] ); break; @@ -111,9 +111,9 @@ class ServerPartHelper extends EquipmentHelper [ "data-src" => "/admin/equipment/serverpart/modify/{$viewDatas['entity']->getPK()}?type={$viewDatas['entity']->getType()}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - "class" => "btn btn-sm btn-outline btn-circle form-label-sm", - "target" => "_self", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", + ...$extras, ] ); } @@ -136,18 +136,14 @@ class ServerPartHelper extends EquipmentHelper case 'RAM': case 'DISK': case 'SOFTWARE': - $extras = [ - "class" => "btn btn-sm btn-outline btn-circle btn-link form-label-sm", - "target" => "_self", - ...$extras, - ]; $action = form_label( $label ? $label : ICONS["SERVER_ITEM_{$action}"], $action, [ "data-src" => "/admin/equipment/serverpart?serverinfo_uid={$viewDatas['serverinfo_uid']}&type={$action}&ActionTemplate=popup", "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm text-primary", ...$extras, ] ); diff --git a/app/Helpers/HomeHelper.php b/app/Helpers/HomeHelper.php index ca2dc19..9eec7a4 100644 --- a/app/Helpers/HomeHelper.php +++ b/app/Helpers/HomeHelper.php @@ -34,15 +34,15 @@ class HomeHelper extends CommonHelper { switch ($action) { case 'new_service_view': - $extras = ["class" => "btn btn-outline btn-light btn-circle form-label-sm", "target" => "_self", ...$extras]; $action = form_label( $label ? $label : ICONS['SEARCH'], $action, [ "data-src" => '/admin/customer/service/view/' . $viewDatas['entity']->getPK(), "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form", - ...$extras + "data-bs-target" => "#modal_action_form", + "class" => "btn btn-sm form-label-sm", + ...$extras, ] ); break; diff --git a/app/Views/layouts/admin/top.php b/app/Views/layouts/admin/top.php index d6736f3..54e0a8f 100644 --- a/app/Views/layouts/admin/top.php +++ b/app/Views/layouts/admin/top.php @@ -30,9 +30,9 @@ "modify", [ "class" => "dropdown-item form-label-sm", - "data-src" => "/admin/user/profile_modify/" . $viewDatas['myAuthUID'], + "data-src" => "/admin/user/profile/" . $viewDatas['myAuthUID'], "data-bs-toggle" => "modal", - "data-bs-target" => "#index_action_form" + "data-bs-target" => "#modal_action_form" ] ) ?>