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

dev #33

Merged
Thibaut merged 4 commits from dev into master 2025-02-10 12:01:59 +00:00
Conversation 0 Commits 4 Files Changed 13 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df33d49cff - Show all commits

4
src/main/java/fr/titionfire/ffsaf/net2/data/SimpleCombModel.java
View File

@ -26,12 +26,12 @@ public class SimpleCombModel {
int licence = 0;
String country = "fr";
public static SimpleCombModel fromModel(MembreModel model) {
public static SimpleCombModel fromModel(MembreModel model) {
if (model == null)
return null;
return new SimpleCombModel(model.getId(), model.getLname(), model.getFname(), model.getCategorie(),
(model.getClub() == null) ? null : SimpleClubModel.fromModel(model.getClub()),
model.getGenre(), model.getLicence(), model.getCountry());
model.getGenre(), (model.getLicence() == null) ? -1 : model.getLicence(), model.getCountry());
}
}