diff --git a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java b/src/main/java/org/springframework/samples/petclinic/controller/UserController.java index 97e99a2c7..7cfa5d80c 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/UserController.java @@ -59,7 +59,8 @@ public class UserController extends WebSocketSender { @InitBinder("user") public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields(CommonAttribute.USER_ID); + // dataBinder.setDisallowedFields(CommonAttribute.USER_ID,"roles"); + } Map oauth2AuthenticationUrls = new HashMap<>(); diff --git a/src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java index eb08fa003..5d002182d 100644 --- a/src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java +++ b/src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java @@ -39,4 +39,10 @@ public class BaseDTO implements Serializable { return this.id == null; } + @Override + public String toString() { + return "BaseDTO{" + + "id=" + id + + '}'; + } } diff --git a/src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java index 1d3168628..01412ee17 100644 --- a/src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java +++ b/src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java @@ -50,4 +50,5 @@ public class NamedDTO extends BaseDTO { return getName().equals(namedDTO.getName()); } + } diff --git a/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java index 3c1cca86d..7c196a68b 100644 --- a/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java +++ b/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java @@ -11,4 +11,8 @@ import java.io.Serializable; */ public class RoleDTO extends NamedDTO implements Serializable { + @Override + public String toString() { + return super.toString(); + } } diff --git a/src/main/resources/templates/users/userChangePasswordForm.html b/src/main/resources/templates/users/userChangePasswordForm.html index 36c70d389..2a01dcf6d 100644 --- a/src/main/resources/templates/users/userChangePasswordForm.html +++ b/src/main/resources/templates/users/userChangePasswordForm.html @@ -27,7 +27,7 @@
- We'll never share your emailConfiguration with anyone else. + We'll never share your email with anyone else.