diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 729f358..5b4f1a6 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -112,7 +112,7 @@ abstract class BaseModel extends Model return $rules; } //Field별 Form Option용 - public function getFormOptions(array $conditions = array(), $options = array()): array + public function getOptions(array $conditions = array(), $options = array()): array { foreach ($this->getEntitys($conditions) as $entity) { $options[$entity->getPrimaryKey()] = $entity->getTitle(); @@ -125,7 +125,7 @@ abstract class BaseModel extends Model case 'user_uid': if (is_null($this->_user_options)) { $userModel = new UserModel([$this->getPrimaryKey(), $this->getTitleField()]); - $this->_user_options = $userModel->getFormOptions(); + $this->_user_options = $userModel->getOptions(); } $options = $this->_user_options; break; diff --git a/app/Models/BoardModel.php b/app/Models/BoardModel.php index fcabcde..ad685a2 100644 --- a/app/Models/BoardModel.php +++ b/app/Models/BoardModel.php @@ -52,7 +52,7 @@ class BoardModel extends BaseHierarchyModel case 'board_config_uid': if (is_null($this->_boardconfig_options)) { $boardConfigModel = new BoardConfigModel([$this->getPrimaryKey(), $this->getTitleField()]); - $this->_boardconfig_options = $boardConfigModel->getFormOptions(); + $this->_boardconfig_options = $boardConfigModel->getOptions(); } $options = $this->_boardconfig_options; break; diff --git a/app/Models/CategoryModel.php b/app/Models/CategoryModel.php index 72a81da..95db96f 100644 --- a/app/Models/CategoryModel.php +++ b/app/Models/CategoryModel.php @@ -45,7 +45,7 @@ class CategoryModel extends BaseHierarchyModel return $this->where($conditions)->first() ?: throw new \Exception("해당 데이터가 없습니다.\n" . var_export($conditions, true)); } - public function getFormOptions(array $conditions = array(), $options = array()): array + public function getOptions(array $conditions = array(), $options = array()): array { $old_title = ""; foreach ($this->where($conditions)->orderby("grpno DESC, grporder ASC")->findAll() as $entity) { diff --git a/app/Models/OrderModel.php b/app/Models/OrderModel.php index 9d8b0fd..ddaa3f5 100644 --- a/app/Models/OrderModel.php +++ b/app/Models/OrderModel.php @@ -45,7 +45,7 @@ class OrderModel extends BaseModel case 'product_uid': if (is_null($this->_product_options)) { $productModel = new productModel([$this->getPrimaryKey(), 'product_uid']); - $this->_product_options = $productModel->getFormOptions(); + $this->_product_options = $productModel->getOptions(); } $options = $this->_product_options; break; diff --git a/app/Models/ProductModel.php b/app/Models/ProductModel.php index bb06f63..691c4b8 100644 --- a/app/Models/ProductModel.php +++ b/app/Models/ProductModel.php @@ -62,7 +62,7 @@ class ProductModel extends BaseModel case 'category_uid': if (is_null($this->_category_options)) { $categoryModel = new CategoryModel([$this->getPrimaryKey(), $this->getTitleField()]); - $this->_category_options = $categoryModel->getFormOptions(); + $this->_category_options = $categoryModel->getOptions(); } $options = $this->_category_options; break;