user detail
This commit is contained in:
@@ -50,7 +50,9 @@ public class AccueilController {
|
|||||||
SearchArticleCritere critere = new SearchArticleCritere();
|
SearchArticleCritere critere = new SearchArticleCritere();
|
||||||
critere.setNoCategorie(searchCategory);
|
critere.setNoCategorie(searchCategory);
|
||||||
critere.setTitle(searchTitle);
|
critere.setTitle(searchTitle);
|
||||||
critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId());
|
if(userDetails != null) {
|
||||||
|
critere.setNoVendeur(userService.utilisateurByName(userDetails.getUsername()).getId());
|
||||||
|
}
|
||||||
critere.setVenteOptions(venteOptions);
|
critere.setVenteOptions(venteOptions);
|
||||||
critere.setAchatOptions(venteOptions);
|
critere.setAchatOptions(venteOptions);
|
||||||
model.addAttribute("articles", articleService.searchArticle(critere));
|
model.addAttribute("articles", articleService.searchArticle(critere));
|
||||||
|
|||||||
@@ -107,7 +107,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="champ-saisie">
|
<div class="champ-saisie">
|
||||||
<label for="password" th:text="#{re}">Mot de passe: </label>
|
<label for="password">Mot de passe: </label>
|
||||||
<div>
|
<div>
|
||||||
<input type="password" th:field="*{password}" id="password" />
|
<input type="password" th:field="*{password}" id="password" />
|
||||||
</div>
|
</div>
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="champ-saisie">
|
<div class="champ-saisie">
|
||||||
<label for="confirmPassword" th:text="#{}">Confirmation du mot de passe: </label>
|
<label for="confirmPassword">Confirmation du mot de passe: </label>
|
||||||
<div>
|
<div>
|
||||||
<input type="password" id="confirmPassword" />
|
<input type="password" id="confirmPassword" />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<button type="submit" class="btn btn-primary">Connexion</button>
|
<button type="submit" class="btn btn-primary">Connexion</button>
|
||||||
<button type="button" class="btn btn-warning text-light" href="/inscription">Créer un compte </button>
|
<button class="btn btn-warning text-light" href="/inscription">Créer un compte </button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div th:if="${param.error}" class="text-danger">
|
<div th:if="${param.error}" class="text-danger">
|
||||||
|
|||||||
Reference in New Issue
Block a user