From a8e29ec69c4b07a52d741520f863e78de1eba5a7 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 9 Jun 2025 21:54:07 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=8B=A4?= =?UTF-8?q?=EC=82=AC=20=EC=B6=94=EA=B0=80=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdminCreateGetController.java | 5 +++++ .../web/model/AdminCreateBindingVO.java | 1 + .../templates/admin/adminCreateForm.html | 22 ++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java index a1bdc921..c96fe152 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.role.list.ports.RoleListPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -14,10 +15,14 @@ import org.springframework.web.bind.annotation.ModelAttribute; public class AdminCreateGetController { private final RoleListPortIn roleListPortIn; + private final UICodeListPortIn uiCodeListPortIn; @GetMapping(path = "/settings/admins/create") String operate(Model model, @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO) { + model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); + model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); + return "admin/adminCreateForm"; } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 3da1926e..95b881d2 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -21,6 +21,7 @@ public class AdminCreateBindingVO { "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") private String email; + private String regionMainCode; private Boolean accountDisabled; private Boolean accountLocked; diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index dd4e2499..b8b734c0 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -51,7 +51,8 @@
@@ -62,6 +63,19 @@
+ +
@@ -115,6 +129,12 @@ } + +