Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

dev #50

Merged
Thibaut merged 2 commits from dev into master 2025-08-15 19:49:13 +00:00
Conversation 0 Commits 2 Files Changed 3 +2 -7
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d740ad255f - Show all commits

3
src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
View File

@ -261,7 +261,8 @@ public class AffiliationService {
}) })
.call(m -> ((m.getUserId() == null) ? keycloakService.initCompte(m.getId()) : .call(m -> ((m.getUserId() == null) ? keycloakService.initCompte(m.getId()) :
keycloakService.setClubGroupMembre(m, club).map(__ -> m.getUserId())) keycloakService.setClubGroupMembre(m, club).map(__ -> m.getUserId()))
.call(userId -> keycloakService.setAutoRoleMembre(userId, m.getRole(), m.getGrade_arbitrage()))) .call(userId -> keycloakService.setAutoRoleMembre(userId, m.getRole(), m.getGrade_arbitrage()))
.call(userId -> keycloakService.setEmail(userId, m.getEmail())))
.call(m -> Mutiny.fetch(m.getLicences()) .call(m -> Mutiny.fetch(m.getLicences())
.call(l1 -> l1 != null && l1.stream().anyMatch(l -> l.getSaison() == saison) ? .call(l1 -> l1 != null && l1.stream().anyMatch(l -> l.getSaison() == saison) ?
Uni.createFrom().nullItem() : Uni.createFrom().nullItem() :

6
src/main/webapp/src/pages/admin/affiliation/AffiliationReqPage.jsx
View File

@ -267,15 +267,9 @@ function MemberPart({index, member}) {
setCurrent(-1) setCurrent(-1)
if (mode === 2) { if (mode === 2) {
setEmail("") setEmail("")
setEmailChoice("0")
} }
}, [mode]); }, [mode]);
useEffect(() => {
if (mode !== 2 && email !== "") {
setEmailChoice("1")
}
}, [email]);
return <div className="col mb-4"> return <div className="col mb-4">
<div className="card"> <div className="card">