fix register
This commit is contained in:
parent
819cca7f2a
commit
db1d3d31b2
|
@ -28,9 +28,7 @@ public class RegisterController {
|
||||||
@RequestParam("password2") String password2,
|
@RequestParam("password2") String password2,
|
||||||
@RequestParam("salutation") String salutation,
|
@RequestParam("salutation") String salutation,
|
||||||
@RequestParam("name") String name,
|
@RequestParam("name") String name,
|
||||||
@RequestParam("address") String address,
|
@RequestParam("address") String address
|
||||||
@RequestParam("type") String type,
|
|
||||||
@RequestParam("ad") String ad
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
Optional<User> user = userRepository.findByEmail(username);
|
Optional<User> user = userRepository.findByEmail(username);
|
||||||
|
@ -52,7 +50,7 @@ public class RegisterController {
|
||||||
newUser.setPassword(password);
|
newUser.setPassword(password);
|
||||||
newUser.email = username;
|
newUser.email = username;
|
||||||
newUser.isEmployee = false;
|
newUser.isEmployee = false;
|
||||||
//TODO for salutation, type, ad are no attributes/fields in the class/database. Add when they are there.
|
newUser.salutation = salutation;
|
||||||
|
|
||||||
newUser.isActive = true;
|
newUser.isActive = true;
|
||||||
newUser.created = new java.sql.Timestamp(System.currentTimeMillis());
|
newUser.created = new java.sql.Timestamp(System.currentTimeMillis());
|
||||||
|
|
|
@ -63,25 +63,6 @@
|
||||||
<textarea rows="5" class="full-width" type="text" name="address" id="address"
|
<textarea rows="5" class="full-width" type="text" name="address" id="address"
|
||||||
placeholder="Optional: Zusatz Optional: Unternehmen Straße Hausnummer Postleitzeit Ort Land"></textarea>
|
placeholder="Optional: Zusatz Optional: Unternehmen Straße Hausnummer Postleitzeit Ort Land"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<fieldset>
|
|
||||||
<input type="radio" name="type" value="priv" id="type-priv" required>
|
|
||||||
<label for="type-priv">Ich bin Privatkunde.</label> <br/>
|
|
||||||
<input type="radio" name="type" value="bus" id="type-bus" required>
|
|
||||||
<label for="type-bus">Ich bin Geschäftskunde.</label> <br/>
|
|
||||||
</fieldset>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2> Werbung </h2>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<fieldset>
|
|
||||||
<input type="radio" name="ad" value="y" id="ad-y" required>
|
|
||||||
<label for="type-priv">Ich möchte Werbung erhalten.</label> <br/>
|
|
||||||
<input type="radio" name="ad" value="n" id="ad-n" required>
|
|
||||||
<label for="type-bus">Ich möchte keine Werbung erhalten.</label> <br/>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button class="full-width" type="submit" name="action" value="login">Registeren</button>
|
<button class="full-width" type="submit" name="action" value="login">Registeren</button>
|
||||||
<a th:href="@{/terms}">
|
<a th:href="@{/terms}">
|
||||||
|
|
Reference in New Issue