corrections post-merge

app/models/__init__.py

@@ -12,7 +12,6 @@ GROUPNAME_STR_LEN = 64
 from app.models.raw_sql_init import create_database_functions
 
 from app.models.absences import Absence, AbsenceNotification, BilletAbsence
-from app.models.config import ScoDocSiteConfig
 from app.models.departements import Departement
 from app.models.etudiants import (
     Identite,
@@ -65,3 +64,4 @@ from app.models.but_refcomp import (
     ApcSituationPro,
     ApcAppCritique,
 )
+from app.models.config import ScoDocSiteConfig

app/models/config.py

@@ -110,6 +110,11 @@ class ScoDocSiteConfig(db.Model):
         else:
             return klass.name
 
+    @classmethod
+    def get_bonus_sport_class(cls):
+        """Get configured bonus function, or None if None."""
+        return cls.get_bonus_sport_class_from_name()
+
     @classmethod
     def get_bonus_sport_class_from_name(cls, class_name=None):
         """returns bonus class with specified name.

app/models/formsemestre.py

@@ -49,7 +49,7 @@ class FormSemestre(db.Model):
     gestion_compensation = db.Column(
         db.Boolean(), nullable=False, default=False, server_default="false"
     )
-    # ne publie pas le bulletin XML:
+    # ne publie pas le bulletin XML ou JSON:
     bul_hide_xml = db.Column(
         db.Boolean(), nullable=False, default=False, server_default="false"
     )