johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

end article start edit article

Browse Source
This commit is contained in:
Parpaillax
2024-04-26 14:29:43 +02:00
parent 5183bf0a7a
commit bd37441f9c
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/eni/enchere/controllers/ArticleController.java
View File

@@ -63,6 +63,7 @@ public class ArticleController {
UserProfil user = userService.utilisateurById(article.getUtilisateur());
Categorie cate = categorieService.findCategorieById(article.getNumCategorie());
Retrait retrait = retraitService.retraitByNumarticle(article.getId());
article.setPseudoUtilisateur(user.getPseudo());
List<Enchere> lastEnchere = this.enchereService.enchereByArticle(article.getId());
Optional<Float> maxMontantEnchere = lastEnchere.stream()
.map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère
@@ -72,7 +73,9 @@ public class ArticleController {
model.addAttribute("cate", cate.getLibelle());
model.addAttribute("retrait", retrait);
model.addAttribute("enchere", new Enchere());
model.addAttribute("maxEnchere", maxMontantEnchere.get());
if (maxMontantEnchere.isPresent()) {
model.addAttribute("maxEnchere", maxMontantEnchere.get());
}
List<ObjectError> errors = (List<ObjectError>) session.getAttribute("errors");
if (errors != null) {
model.addAttribute("errors", errors);

2
src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
View File

@@ -28,7 +28,7 @@ public class UserInterceptor implements HandlerInterceptor {
if (authentication != null && authentication.isAuthenticated() && !authentication.getName().equals("anonymousUser")) {
UserProfil user = this.userService.utilisateurByName(authentication.getName());
if (modelAndView != null && modelAndView.getViewName() != null && !modelAndView.getViewName().startsWith("redirect:")) {
modelAndView.addObject("user", user.getCredit());
modelAndView.addObject("user", user);
}
}
}