error edit beres

src/main/kotlin/com/server/alb/controllers/BugController.kt

@@ -64,6 +64,7 @@ class BugController(
     @GetMapping(value = ["/reg"])
     fun showRegister(model: Model): String {
         val userRole = UserRole()
+        userRole.oldPass = "***"
         model.addAttribute("userRole", userRole)
         model.addAttribute("role", getRole())
         return "reg"
@@ -235,23 +236,22 @@ class BugController(
 
     @PostMapping(value = ["/saveUser"])
     fun saveUserEdit(
-        @ModelAttribute("userRole") userRole: UserRole,
+        @Valid @ModelAttribute("userRole") userRole: UserRole,
+        bindingResult: BindingResult,
         redirectAttributes: RedirectAttributes,
         model: Model
     ): String {
+        if (bindingResult.hasErrors()){
+            return "edit_user"
+        }
         val existUser = userService[userRole.id]
         val editUser = User()
         editUser.id = existUser.id
         editUser.username = userRole.username
         editUser.password = existUser.password
-        userRole.password = existUser.password
         editUser.roles = userRole.role
         editUser.isEnabled = true
         model.addAttribute("role", getRole())
-        if (userRole.username.isEmpty()) {
-            redirectAttributes.addFlashAttribute("successMessage", "User Name tidak boleh kosong")
-            return "redirect:/userList/edit/" + userRole.id
-        }
         userService.save(editUser)
         redirectAttributes.addFlashAttribute("successMessage", "Success save user")
         return "redirect:/userList"
@@ -259,10 +259,14 @@ class BugController(
 
     @PostMapping(value = ["/saveChangePass"])
     fun saveChangePass(
-        @ModelAttribute("userRole") userRole: UserRole,
+        @Valid @ModelAttribute("userRole") userRole: UserRole,
+        bindingResult: BindingResult,
         redirectAttributes: RedirectAttributes,
         model: Model
     ): String {
+        if (bindingResult.hasErrors()) {
+            return "change_pass"
+        }
         val existUser = userService[userRole.id]
         val editUser = User()
         editUser.id = userRole.id
@@ -272,11 +276,7 @@ class BugController(
         editUser.isEnabled = true
         val check = userService.checkIfValidOldPassword(userRole.oldPass, existUser.password)
         if (!check) {
-            redirectAttributes.addFlashAttribute("successMessage", "old password not match")
-            return "redirect:/userList/chgPass/" + userRole.id
-        } else if (userRole.password.isBlank()) {
-            redirectAttributes.addFlashAttribute("successMessage", "Password tidak boleh kosong")
-            return "redirect:/userList/chgPass/" + userRole.id
+            return "change_pass"
         }
         userService.save(editUser)
         redirectAttributes.addFlashAttribute("successMessage", "Success save user")
@@ -326,6 +326,7 @@ class BugController(
         userRole.username = user.username
         userRole.password = user.password
         userRole.role = user.roles
+        userRole.oldPass = "***"
         mav.addObject("userRole", userRole)
         mav.addObject("role", getRole())
         return mav

src/main/kotlin/com/server/alb/models/UserRole.kt

@@ -16,6 +16,7 @@ class UserRole {
     var role: Set<Role> = HashSet()
     var isEnabled = false
 
+    @NotBlank(message = "Old Password tidak boleh kosong")
     var oldPass: String = ""
 
     override fun toString(): String {

src/main/resources/templates/change_pass.html

@@ -24,11 +24,18 @@
             <tr>
                 <td>Old Password:</td>
                 <td><input id="oldPass" type="password" th:field="*{oldPass}" class="form-control"></td>
-                <span th:text="${successMessage}" style="color:red"></span>
+                <td th:if="${#fields.hasErrors('oldPass')}" th:errors="*{oldPass}" style="color:red">password Error</td>
             </tr>
             <tr>
                 <td>New Password:</td>
                 <td><input id="password" type="password" th:field="*{password}" class="form-control"></td>
+                <td th:if="${#fields.hasErrors('password')}" th:errors="*{password}" style="color:red">password Error</td>
+            </tr>
+            <tr hidden="hidden">
+                <td>Role:</td>
+                <td><select th:field="*{role}">
+                    <option th:each="role: ${role}" th:value="${role.id}" th:text="${role.name}"></option>
+                </select></td>
             </tr>
             <tr>
                 <td colspan="2">

src/main/resources/templates/edit_user.html

@@ -21,7 +21,15 @@
             <tr>
                 <td>User Name:</td>
                 <td><input type="text" th:field="*{username}" class="form-control"></td>
-                <span th:text="${successMessage}" style="color:red"></span>
+                <td th:if="${#fields.hasErrors('username')}" th:errors="*{username}" style="color:red">username Error</td>
+            </tr>
+            <tr hidden="hidden">
+                <td>Password:</td>
+                <td><input id="password" type="text" th:field="*{password}" class="form-control"></td>
+            </tr>
+            <tr hidden="hidden">
+                <td>Old Password:</td>
+                <td><input id="oldPass" type="text" th:field="*{oldPass}" class="form-control"></td>
             </tr>
             <tr>
                 <td>Role:</td>

src/main/resources/templates/reg.html

@@ -22,6 +22,10 @@
                 <td><input type="password" th:field="*{password}" class="form-control"/></td>
                 <td th:if="${#fields.hasErrors('password')}" th:errors="*{password}" style="color:red">password Error</td>
             </tr>
+            <tr hidden="hidden">
+                <td>Old Password:</td>
+                <td><input id="oldPass" type="text" th:field="*{oldPass}" class="form-control"></td>
+            </tr>
             <tr>
                 <td>Role:</td>
                 <td><select th:field="*{role}">