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

Compare commits

base: Thibaut:e81f4754026959858f91cbf8c09262f7db5da4ee
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1
...
compare: Thibaut:870891a77c9208fef8de15b2ecb5d96d7de5d80b
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1

3 Commits
e81f475402 ... 870891a77c

Author SHA1 Message Date
Thibaut Valentin
870891a77c Merge pull request 'dev' (#73) from dev into master 
Reviewed-on: #73
 2025-12-19 15:14:04 +00:00
Thibaut Valentin
7e1356b621 fix: cm auto ask new category on empty competition
All checks were successful
Deploy Production Server / if_merged (pull_request) Successful in 10m17s
Details
2025-12-19 16:13:37 +01:00
Thibaut Valentin
b689521e56 fix: comb register with null license 2025-12-19 16:02:28 +01:00
2 changed files with 4 additions and 2 deletions
Show Stats 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, public Uni<SimpleRegisterComb> addRegisterComb(SecurityCtx securityCtx, Long id, RegisterRequestData data,
String source) { String source) {
if ("admin".equals(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) return permService.hasEditPerm(securityCtx, id)
.chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname()) .chain(c -> findComb(data.getLicence(), data.getFname(), data.getLname())
.call(combModel -> Mutiny.fetch(combModel.getLicences())) .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(() => { useEffect(() => {
if (cats && cats.length > 0 && !cat) { if (cats && cats.length > 0 && !cat) {
setCatId(cats.sort((a, b) => a.name.localeCompare(b.name))[0].id); setCatId(cats.sort((a, b) => a.name.localeCompare(b.name))[0].id);
} else if (cats && cats.length === 0) {
setModal({});
bthRef.current.click();
} }
}, [cats]); }, [cats]);
@ -77,7 +80,6 @@ function CategoryHeader({cat, setCatId}) {
} else { // New category } else { // New category
setModal({}); setModal({});
bthRef.current.click(); bthRef.current.click();
console.log(cat);
e.target.value = cat?.id; e.target.value = cat?.id;
} }
} }