Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
CodeSteak | f667d41c3c | |
CodeSteak | 3a85997f99 | |
CodeSteak | 471d859987 | |
CodeSteak | 701e3c9cf6 |
|
@ -94,25 +94,22 @@ public class CustomersIndexController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/{id}/resetPassword")
|
@PostMapping("/{id}/resetPassword")
|
||||||
public String resetPassword(@PathVariable("id") Long id,
|
public String resetPassword(Model model,
|
||||||
|
@PathVariable("id") Long id,
|
||||||
@RequestParam("password") String password,
|
@RequestParam("password") String password,
|
||||||
@RequestParam("password2") String password2,
|
@RequestParam("password2") String password2,
|
||||||
|
HttpServletResponse response,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
if (!password.equals(password2)) {
|
if (!password.equals(password2)) {
|
||||||
request.setAttribute("error", "Passwörter stimmen nicht überein!");
|
request.setAttribute("error", "Passwörter stimmen nicht überein!");
|
||||||
return "intern/customers/id";
|
return internCustomersId(model, id, response, request);
|
||||||
}
|
}
|
||||||
User user = userRepository.findById(id).get();
|
User user = userRepository.findById(id).get();
|
||||||
if (!user.validatePassword(password)) {
|
user.setPassword(password);
|
||||||
request.setAttribute("error", "Die Passwörter stimmen nicht mit dem Original überein!");
|
|
||||||
return "intern/customers/id";
|
|
||||||
}
|
|
||||||
user.setPassword("12345");
|
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
request.setAttribute("info", "Passwort wurde auf 12345 geändert!");
|
|
||||||
|
|
||||||
return "intern/customers/id";
|
return "redirect:/intern/customers/" + id.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ spring.datasource.url=jdbc:sqlite:./e-commerce.db
|
||||||
spring.datasource.driverClassName=org.sqlite.JDBC
|
spring.datasource.driverClassName=org.sqlite.JDBC
|
||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLiteDialect
|
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLiteDialect
|
||||||
spring.jpa.hibernate.ddl-auto=update
|
spring.jpa.hibernate.ddl-auto=update
|
||||||
spring.jpa.show-sql=true
|
|
||||||
# Session
|
# Session
|
||||||
#spring.session.store-type=jdbc
|
#spring.session.store-type=jdbc
|
||||||
#spring.session.jdbc.initialize-schema=always
|
#spring.session.jdbc.initialize-schema=always
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
<input type="hidden" id="ref_hidden" th:value="${ArticleID.offerID}" name="ref-article" />
|
<input type="hidden" id="ref_hidden" th:value="${ArticleID.offerID}" name="ref-article" />
|
||||||
|
|
||||||
<a th:href="${'/intern/supplierOffers/#q=' + ArticleID.id}">Details</a>
|
<a th:href="${'/intern/supplierOffers/#q=' + ArticleID.offerID}">Details</a>
|
||||||
</p>
|
</p>
|
||||||
<div class="spacer"></div>
|
<div class="spacer"></div>
|
||||||
<div class="m">
|
<div class="m">
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
<tr th:each="order : ${SupplierDetail.orders}">
|
<tr th:each="order : ${SupplierDetail.orders}">
|
||||||
<td><span th:text="${order.id}"></span></td>
|
<td><span th:text="${order.id}"></span></td>
|
||||||
<td><span th:text="${order.dateOrder}"></span></td>
|
<td><span th:text="${order.dateOrder}"></span></td>
|
||||||
<td><a th:href="@{/intern/articles/{id}(id = ${order.articleId})}" class="button smaller" th:text="${order.articleName}"></a></td>
|
<td><span th:text="${order.articleName}"></span></td>
|
||||||
<td><span th:text="${order.priceNet}"></span> €</td>
|
<td><span th:text="${order.priceNet}"></span> €</td>
|
||||||
<td><span th:text="${order.quantity}"></span></td>
|
<td><span th:text="${order.quantity}"></span></td>
|
||||||
<td><span th:text="${order.priceTotal}"></span> €</td>
|
<td><span th:text="${order.priceTotal}"></span> €</td>
|
||||||
|
|
Reference in New Issue