diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 368caf9..96c5df1 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -62,7 +62,7 @@ $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'au $routes->group('usersns', static function ($routes) { $routes->get('', 'UserSNSController::index'); $routes->get('excel', 'UserSNSController::excel'); - $routes->get('view/(:uuid)', 'UserController::view/$1'); + $routes->get('view/(:num)', 'UserController::view/$1'); $routes->get('delete/(:num)', 'UserSNSController::delete/$1', ['filter' => 'authFilter:master,director']); $routes->get('toggle/(:num)/(:hash)', 'UserSNSController::toggle/$1/$2', ['filter' => 'authFilter:master,director']); }); diff --git a/app/Controllers/Admin/LoggerController.php b/app/Controllers/Admin/LoggerController.php index eb14627..fae9b08 100644 --- a/app/Controllers/Admin/LoggerController.php +++ b/app/Controllers/Admin/LoggerController.php @@ -51,10 +51,10 @@ class LoggerController extends \App\Controllers\Admin\AdminController case 'user_uid': if (is_null($this->_user_uids)) { //모든 필요한 FormOption등 조기화작업 필요 - $this->_user_uids = [DEFAULTS['EMPTY'] => lang($this->_className . '.label.' . $field) . ' 선택']; - foreach ($this->getUserModel()->findAll() as $user) { - $this->_user_uids[$user['uid']] = $user['name']; - } + $this->_user_uids = $this->getUserModel()->getList( + ['status' => 'use'], + [DEFAULTS['EMPTY'] => lang($this->_className . '.label.' . $field) . ' 선택'] + ); } return $this->_user_uids; break; diff --git a/app/Controllers/Admin/UserSNSController.php b/app/Controllers/Admin/UserSNSController.php index b1bf419..192c61c 100644 --- a/app/Controllers/Admin/UserSNSController.php +++ b/app/Controllers/Admin/UserSNSController.php @@ -18,13 +18,18 @@ class UserSNSController extends \App\Controllers\Admin\AdminController $this->_className .= '/UserSNS'; $this->_model = new UserSNSModel(); $this->_defines = [ + 'view' => [ + 'fields' => ['user_uid', 'site', 'id', 'name', 'email', 'status', 'updated_at', 'created_at', 'detail'], + 'fieldFilters' => ['user_uid', 'status'], + 'fieldRules' => [], + ], 'index' => [ - 'fields' => ['site', 'user_uid', 'name', 'email', 'status', 'created_at'], + 'fields' => ['user_uid', 'site', 'id', 'name', 'email', 'status', 'created_at'], 'fieldFilters' => ['user_uid', 'status'], 'batchjobFilters' => [], ], 'excel' => [ - 'fields' => ['site', 'user_uid', 'name', 'email', 'status', 'created_at'], + 'fields' => ['user_uid', 'site', 'id', 'name', 'email', 'status', 'created_at'], 'fieldFilters' => ['user_uid', 'status'], ], ]; @@ -46,10 +51,10 @@ class UserSNSController extends \App\Controllers\Admin\AdminController case 'user_uid': if (is_null($this->_user_uids)) { //모든 필요한 FormOption등 조기화작업 필요 - $this->_user_uids = [DEFAULTS['EMPTY'] => lang($this->_className . '.label.' . $field) . ' 선택']; - foreach ($this->getUserModel()->findAll() as $user) { - $this->_user_uids[$user['uid']] = $user['name']; - } + $this->_user_uids = $this->getUserModel()->getList( + ['status' => 'use'], + [DEFAULTS['EMPTY'] => lang($this->_className . '.label.' . $field) . ' 선택'] + ); } return $this->_user_uids; break; diff --git a/app/Language/en/Admin/UserSNS.php b/app/Language/en/Admin/UserSNS.php index 82cdd79..72631b5 100644 --- a/app/Language/en/Admin/UserSNS.php +++ b/app/Language/en/Admin/UserSNS.php @@ -5,8 +5,9 @@ return [ 'uid' => "인증번호", 'user_uid' => "사용자", 'site' => "SNS명", - 'name' => "이름", - 'email' => "메일", + 'id' => "SNS ID", + 'name' => "SNS 이름", + 'email' => "SNS 메일", 'status' => "상태", 'updated_at' => "수정일", 'created_at' => "작성일" diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php index c3795ce..b89c88c 100644 --- a/app/Models/UserModel.php +++ b/app/Models/UserModel.php @@ -61,4 +61,12 @@ class UserModel extends CommonModel $this->orderBy("name", "ASC"); parent::setIndexOrderBy($field, $order); } + + public function getList(array $wheres = array(), $temps = array()): array + { + foreach ($this->where($wheres)->findAll() as $user) { + $temps[$user['uid']] = $user['name']; + } + return $temps; + } } diff --git a/app/Models/UserSNSModel.php b/app/Models/UserSNSModel.php index 7a6cdf5..f52da9b 100644 --- a/app/Models/UserSNSModel.php +++ b/app/Models/UserSNSModel.php @@ -11,7 +11,7 @@ class UserSNSModel extends CommonModel // protected $useAutoIncrement = true; protected $allowedFields = ['user_uid', 'site', 'id', 'name', 'email', 'detail', 'status', 'updated_at', 'created_at']; protected $validationRules = [ - 'user_uid' => 'if_exist|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]', + 'user_uid' => 'if_exist|number]', 'site' => 'required|string', 'id' => 'required|string', 'name' => 'required|string',