Fix wagtail familles - pas de contenu (#1801)

Author: fabienheureux

.github/workflows/_cd-by-environment.yml renamed to .github/workflows/_deploy-airflow.yml

@@ -6,15 +6,6 @@ on:
         required: true
 
 jobs:
-  deploy-django:
-    name: 🗺️ Carte & assistant
-    uses: ./.github/workflows/_deploy-on-scalingo.yml
-    secrets: inherit # pragma: allowlist secret`
-    with:
-      environment: ${{ inputs.environment }}
-      # Name of environment variable set in github environment
-      app_name_key: DJANGO_SCALINGO_APP_NAME
-
   deploy_airflow-webserver:
     name: 🔄 Airflow webserver
     uses: ./.github/workflows/_deploy-on-clever-cloud.yml

.github/workflows/_deploy-webapp.yml

@@ -0,0 +1,22 @@
+on:
+  workflow_call:
+    inputs:
+      environment:
+        type: string
+        required: true
+
+jobs:
+  deploy-django:
+    name: 🗺️ Carte & assistant
+    uses: ./.github/workflows/_deploy-on-scalingo.yml
+    secrets: inherit # pragma: allowlist secret`
+    with:
+      environment: ${{ inputs.environment }}
+      # Name of environment variable set in github environment
+      app_name_key: DJANGO_SCALINGO_APP_NAME
+
+# Address actions/missing-workflow-permissions rule in
+# code scanning alerts
+permissions:
+  contents: read
+

.github/workflows/cd.yml

@@ -13,14 +13,21 @@ jobs:
     name: 🤖 CI
     uses: ./.github/workflows/ci.yml
 
-  preprod:
-    name: 🟠 Preprod
-    uses: ./.github/workflows/_cd-by-environment.yml
+  webapp:
+    name: 🟠 Webapp
+    uses: ./.github/workflows/_deploy-webapp.yml
     secrets: inherit # pragma: allowlist secret`
     needs: [ci]
     with:
       environment: preprod
 
+  airflow:
+    name: 🟠 Airflow
+    uses: ./.github/workflows/_deploy-airflow.yml
+    secrets: inherit # pragma: allowlist secret`
+    needs: [ci]
+    with:
+      environment: preprod
 
   # Common release-drafter configuration
   # From https://github.com/marketplace/actions/release-drafter
@@ -53,9 +60,9 @@ jobs:
           config-name: release-config.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    needs: [preprod]
+    needs: [webapp]
     if: ${{ !contains( github.ref_name, 'hotfix') }}
-    
+
   # Hotfix-only release draft update
   update_release_draft_for_hotfix:
     # Uncomment when anchor are supported in GitHub Actions
@@ -71,4 +78,4 @@ jobs:
           config-name: release-config.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    if: ${{ contains( github.ref_name, 'hotfix') }}
+    if: ${{ contains( github.ref_name, 'hotfix') }}

qfdmd/models.py

@@ -81,6 +81,7 @@ def famille(self):
     def compiled_body(self):
         if not getattr(self, "body") and self.famille:
             return self.famille.specific.body
+        return self.body
 
     genre = models.CharField("Genre", choices=[("m", "Masculin"), ("f", "Féminin")])
     nombre = models.IntegerField("Nombre", choices=[(1, "singulier"), (2, "pluriel")])