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

Compare commits

base: Thibaut:d3fb884ab4f1bc5e179d92913ccbd56bfd17445f
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1
..
compare: Thibaut:ee730be570ae782f06af5cdffa797b18d1f72db4
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1

No commits in common. "d3fb884ab4f1bc5e179d92913ccbd56bfd17445f" and "ee730be570ae782f06af5cdffa797b18d1f72db4" have entirely different histories.
d3fb884ab4 ... ee730be570

1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/fr/titionfire/ffsaf/rest/data/MeData.java
View File

@ -46,7 +46,7 @@ public class MeData {
this.id = membreModel.getId(); this.id = membreModel.getId();
this.lname = membreModel.getLname(); this.lname = membreModel.getLname();
this.fname = membreModel.getFname(); this.fname = membreModel.getFname();
this.categorie = membreModel.getCategorie() == null ? "catégorie inconnue" : membreModel.getCategorie().getName(); this.categorie = membreModel.getCategorie().getName();
this.club = membreModel.getClub() == null ? "Sans club" : membreModel.getClub().getName(); this.club = membreModel.getClub() == null ? "Sans club" : membreModel.getClub().getName();
this.genre = membreModel.getGenre().str; this.genre = membreModel.getGenre().str;
this.licence = membreModel.getLicence(); this.licence = membreModel.getLicence();