localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fixes from PR review

Browse Source
This commit is contained in:
Hendrik Schutter 2020-06-13 10:41:59 +02:00
parent a41889b2cb
commit e0e853a575
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java
View File

@ -35,19 +35,19 @@ public class LoginController {
Optional<User> user = userRepository.findByEmail(username); Optional<User> user = userRepository.findByEmail(username);
if (!user.isPresent()) { if (!user.isPresent()) {
request.setAttribute("error", "Email Adresse falsch."); request.setAttribute("error", "Die Email Adresse falsch.");
response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
return "login"; return "login";
} }
if (!user.get().validatePassword(password)) { if (!user.get().validatePassword(password)) {
request.setAttribute("error", "Passwort falsch."); request.setAttribute("error", "Das Passwort ist falsch.");
response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
return "login"; return "login";
} }
if (!user.get().isActive) { if (!user.get().isActive) {
request.setAttribute("error", "User ist deaktiviert."); request.setAttribute("error", "Dieses Konto ist deaktiviert..");
response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
return "login"; return "login";
} }

4
prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
View File

@ -31,13 +31,13 @@ public class RegisterController {
HttpSession session) { HttpSession session) {
Optional<User> user = userRepository.findByEmail(username); Optional<User> user = userRepository.findByEmail(username);
if (user.isPresent()) { if (user.isPresent()) {
request.setAttribute("error", "Email Adresse existiert bereits!"); request.setAttribute("error", "Die Email Adresse existiert bereits.");
response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
return "register"; return "register";
} }
if (!password.equals(password2)) { if (!password.equals(password2)) {
request.setAttribute("error", "Passwörter sind nicht gleich"); request.setAttribute("error", "Die Passwörter stimmen nicht überein.");
response.setStatus(HttpServletResponse.SC_BAD_REQUEST); response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
return "register"; return "register";
} }

8
prototype/src/main/resources/templates/register.html
View File

@ -56,9 +56,9 @@
</div> </div>
<fieldset> <fieldset>
<input type="radio" id="type-priv" name="type" value="priv"> <input type="radio" id="type-priv" name="type" value="priv">
<label for="male">Ich bin Privatkunde</label><br> <label for="type-priv">Ich bin Privatkunde</label><br>
<input type="radio" id="type-bus" name="type" value="bus"> <input type="radio" id="type-bus" name="type" value="bus">
<label for="female">Ich bin Geschäftskunde</label><br> <label for="type-bus">Ich bin Geschäftskunde</label><br>
</fieldset> </fieldset>
<div> <div>
<h2> Werbung </h2> <h2> Werbung </h2>
@ -66,9 +66,9 @@
<div> <div>
<fieldset> <fieldset>
<input type="radio" id="ad-y" name="ad" value="y"> <input type="radio" id="ad-y" name="ad" value="y">
<label for="age1">Ich möchte Werbung erhalten.</label><br> <label for="ad-y">Ich möchte Werbung erhalten.</label><br>
<input type="radio" id="ad-n" name="ad" value="n"> <input type="radio" id="ad-n" name="ad" value="n">
<label for="age2">Ich möchte keine Werbung erhalten.</label><br> <label for="ad-n">Ich möchte keine Werbung erhalten.</label><br>
</fieldset> </fieldset>
</div> </div>
<div> <div>