diff --git a/src/main/java/fr/eni/enchere/controllers/AccueilController.java b/src/main/java/fr/eni/enchere/controllers/AccueilController.java index e8a1ac2..d00e519 100644 --- a/src/main/java/fr/eni/enchere/controllers/AccueilController.java +++ b/src/main/java/fr/eni/enchere/controllers/AccueilController.java @@ -50,7 +50,9 @@ public class AccueilController { SearchArticleCritere critere = new SearchArticleCritere(); critere.setNoCategorie(searchCategory); critere.setTitle(searchTitle); - critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId()); + if(userDetails != null) { + critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId()); + } critere.setVenteOptions(venteOptions); critere.setAchatOptions(venteOptions); model.addAttribute("articles", articleService.searchArticle(critere)); diff --git a/src/main/resources/templates/inscription.html b/src/main/resources/templates/inscription.html index abe53e1..af30f07 100644 --- a/src/main/resources/templates/inscription.html +++ b/src/main/resources/templates/inscription.html @@ -107,7 +107,7 @@
- +
@@ -118,7 +118,7 @@
- +
diff --git a/src/main/resources/templates/security/login.html b/src/main/resources/templates/security/login.html index 20b4228..0fcca71 100644 --- a/src/main/resources/templates/security/login.html +++ b/src/main/resources/templates/security/login.html @@ -26,7 +26,7 @@
- +