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

merge conflict

Browse Source
This commit is contained in:
Parpaillax
2024-04-25 15:44:49 +02:00
parent 061c4003ed a898b160b7
commit 34d3696adf
6 changed files with 96 additions and 8 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,9 +63,12 @@ public class ArticleController {
Article article = articleService.findArticleById(id);
UserProfil user = userService.utilisateurById(article.getUtilisateur());
Categorie cate = categorieService.findCategorieById(article.getNumCategorie());
Retrait retrait = retraitService.retraitByNumarticle(article.getId());
model.addAttribute("article", article);
model.addAttribute("username", user.getPseudo());
model.addAttribute("username", user);
model.addAttribute("cate", cate.getLibelle());
model.addAttribute("retrait", retrait);
model.addAttribute("enchere", new Enchere());
return "article";
} else {
return "redirect:/accueil";