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

Merge pull request 'dev' (#73) from dev into master

Browse Source 
Reviewed-on: #73
This commit is contained in:
Thibaut Valentin 2025-12-19 15:14:04 +00:00
commit 870891a77c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/titionfire/ffsaf/domain/service/CompetitionService.java
View File

@ -281,7 +281,7 @@ public class CompetitionService {
public Uni<SimpleRegisterComb> addRegisterComb(SecurityCtx securityCtx, Long id, RegisterRequestData data,
String source) {
if ("admin".equals(source))
if (data.getLicence() != -1) { // not a guest
if (data.getLicence() == null || data.getLicence() != -1) { // not a guest
return permService.hasEditPerm(securityCtx, id)
.chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname())
.call(combModel -> Mutiny.fetch(combModel.getLicences()))

4
src/main/webapp/src/pages/competition/editor/CMAdmin.jsx
View File

@ -67,6 +67,9 @@ function CategoryHeader({cat, setCatId}) {
useEffect(() => {
if (cats && cats.length > 0 && !cat) {
setCatId(cats.sort((a, b) => a.name.localeCompare(b.name))[0].id);
} else if (cats && cats.length === 0) {
setModal({});
bthRef.current.click();
}
}, [cats]);
@ -77,7 +80,6 @@ function CategoryHeader({cat, setCatId}) {
} else { // New category
setModal({});
bthRef.current.click();
console.log(cat);
e.target.value = cat?.id;
}
}