From 1c69c8998ca316f5aa73cadf32ca0034b27d47a6 Mon Sep 17 00:00:00 2001 From: BrittanyBi Date: Wed, 1 May 2019 22:32:09 -0600 Subject: [PATCH] PAN-54 IT WORKS --- .../controller/UserCreationController.java | 6 ------ .../tsp/website/forms/UserCreationForm.java | 15 -------------- src/main/webapp/WEB-INF/jsp/User.jsp | 20 ------------------- src/main/webapp/WEB-INF/jsp/index.jsp | 2 ++ .../WEB-INF/jsp/successfulRegistration.jsp | 3 ++- 5 files changed, 4 insertions(+), 42 deletions(-) diff --git a/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java b/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java index 62da3e0..9b6e4f8 100644 --- a/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java +++ b/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java @@ -30,15 +30,9 @@ public class UserCreationController { @PostMapping({"/",""}) public String registerUser(@Validated final UserCreationForm userCreationForm, final Model model) { - //model.addAttribute("userID", userCreationForm.getUserID()); model.addAttribute("username", userCreationForm.getUsername()); model.addAttribute("password", userCreationForm.getPassword()); - //model.addAttribute("confirmPassword", userCreationForm.getConfirmPassword()); model.addAttribute("emailAddress", userCreationForm.getEmailAddress()); - //model.addAttribute("firstName", userCreationForm.getFirstName()); - //model.addAttribute("lastName", userCreationForm.getLastName()); - //model.addAttribute("referrer", userCreationForm.getReferrer()); - //model.addAttribute("TnCAgreement", userCreationForm.isAgreedToTerms()); LOG.info("Saving user {}...", userCreationForm); diff --git a/src/main/java/edu/msudenver/tsp/website/forms/UserCreationForm.java b/src/main/java/edu/msudenver/tsp/website/forms/UserCreationForm.java index 23e0e8f..ec7f132 100644 --- a/src/main/java/edu/msudenver/tsp/website/forms/UserCreationForm.java +++ b/src/main/java/edu/msudenver/tsp/website/forms/UserCreationForm.java @@ -5,15 +5,10 @@ import lombok.Setter; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; @Getter @Setter public class UserCreationForm { - @NotNull - @Positive - private int userID; - @NotNull @NotEmpty private String username; @@ -30,16 +25,6 @@ public class UserCreationForm { @NotEmpty private String emailAddress; - @NotNull - @NotEmpty - private String firstName; - - @NotNull - @NotEmpty - private String lastName; - - private String referrer; // optional - @NotNull private boolean agreedToTerms; } diff --git a/src/main/webapp/WEB-INF/jsp/User.jsp b/src/main/webapp/WEB-INF/jsp/User.jsp index 9645505..08c6794 100644 --- a/src/main/webapp/WEB-INF/jsp/User.jsp +++ b/src/main/webapp/WEB-INF/jsp/User.jsp @@ -116,11 +116,6 @@ New User Registration:
- -

- -
- -
- -