From 1655afa3229da7fde8f8619ac671873926404978 Mon Sep 17 00:00:00 2001 From: Fabien Le Frapper Date: Mon, 18 Nov 2024 11:26:52 +0100 Subject: [PATCH 1/2] erge bonus reparation into a constant --- .secrets.baseline | 4 ++-- content/__init__.py | 0 content/apps.py | 6 ++++++ content/constants.py | 1 + content/context_processors.py | 5 +++++ content/migrations/__init__.py | 0 core/settings.py | 2 ++ integration_tests/qfdmo/test_acteur_detail.py | 2 +- jinja2/qfdmo/acteur/_labels/bonus.html | 2 +- jinja2/qfdmo/acteur/tabs/sections/bonus.html | 2 +- qfdmo/forms.py | 3 ++- 11 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 content/__init__.py create mode 100644 content/apps.py create mode 100644 content/constants.py create mode 100644 content/context_processors.py create mode 100644 content/migrations/__init__.py diff --git a/.secrets.baseline b/.secrets.baseline index b9556f480..2636227ad 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -151,7 +151,7 @@ "filename": "core/settings.py", "hashed_secret": "1ee34e26aeaf89c64ecc2c85efe6a961b75a50e9", "is_verified": false, - "line_number": 208 + "line_number": 210 } ], "docker-compose.yml": [ @@ -207,5 +207,5 @@ } ] }, - "generated_at": "2024-11-14T16:27:43Z" + "generated_at": "2024-11-18T10:26:49Z" } diff --git a/content/__init__.py b/content/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/content/apps.py b/content/apps.py new file mode 100644 index 000000000..087ec170c --- /dev/null +++ b/content/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ContentConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "content" diff --git a/content/constants.py b/content/constants.py new file mode 100644 index 000000000..1990beb0b --- /dev/null +++ b/content/constants.py @@ -0,0 +1 @@ +bonus_reparation = "Propose le bonus réparation" diff --git a/content/context_processors.py b/content/context_processors.py new file mode 100644 index 000000000..bd4ff5b27 --- /dev/null +++ b/content/context_processors.py @@ -0,0 +1,5 @@ +from . import constants + + +def content(request): + return vars(constants) diff --git a/content/migrations/__init__.py b/content/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/core/settings.py b/core/settings.py index 91f689f56..1b9220393 100644 --- a/core/settings.py +++ b/core/settings.py @@ -53,6 +53,7 @@ "dsfr", "django.forms", "colorfield", + "content", "core", "qfdmd", "qfdmo", @@ -164,6 +165,7 @@ def context_processors(): "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", "core.context_processors.environment", + "content.context_processors.content", "dsfr.context_processors.site_config", ] diff --git a/integration_tests/qfdmo/test_acteur_detail.py b/integration_tests/qfdmo/test_acteur_detail.py index 37651b829..5f8f204da 100644 --- a/integration_tests/qfdmo/test_acteur_detail.py +++ b/integration_tests/qfdmo/test_acteur_detail.py @@ -52,7 +52,7 @@ class TestDisplayLabel: ), ( [("label", "Mon label", False, True)], - "Éligible au bonus réparation", + "Propose le bonus réparation", True, ), ], diff --git a/jinja2/qfdmo/acteur/_labels/bonus.html b/jinja2/qfdmo/acteur/_labels/bonus.html index ad1b04b49..c67cf8d81 100644 --- a/jinja2/qfdmo/acteur/_labels/bonus.html +++ b/jinja2/qfdmo/acteur/_labels/bonus.html @@ -1,3 +1,3 @@ -{% with content="Éligible au bonus réparation",icon="fr-icon-percent-line" %} +{% with content=bonus_reparation,icon="fr-icon-percent-line" %} {% include "qfdmo/shared/tag.html" %} {% endwith %} diff --git a/jinja2/qfdmo/acteur/tabs/sections/bonus.html b/jinja2/qfdmo/acteur/tabs/sections/bonus.html index b9840c71d..15afd4253 100644 --- a/jinja2/qfdmo/acteur/tabs/sections/bonus.html +++ b/jinja2/qfdmo/acteur/tabs/sections/bonus.html @@ -4,7 +4,7 @@ {% block title %} {# TODO : icone #} -Éligible au bonus réparation +{{ bonus_reparation }} {% endblock title %} {% block content %} diff --git a/qfdmo/forms.py b/qfdmo/forms.py index e3cda2f3c..4f89ba48f 100644 --- a/qfdmo/forms.py +++ b/qfdmo/forms.py @@ -7,6 +7,7 @@ from django.utils.safestring import mark_safe from dsfr.forms import DsfrBaseForm +from content.constants import bonus_reparation from qfdmo.fields import GroupeActionChoiceField from qfdmo.geo_api import epcis_from, formatted_epcis_as_list_of_tuple from qfdmo.models import DagRun, DagRunStatus, SousCategorieObjet @@ -179,7 +180,7 @@ def load_choices(self, request: HttpRequest, **kwargs) -> None: ), label=mark_safe( "" - " Éligible au bonus réparation" + f" {bonus_reparation}" ), help_text=mark_safe( "Afficher uniquement les adresses éligibles (uniquement valable lorsque l'" From a83d9ab75af1b2e30666eb7e16cfbf4471f62437 Mon Sep 17 00:00:00 2001 From: Fabien Le Frapper Date: Tue, 19 Nov 2024 09:59:17 +0100 Subject: [PATCH 2/2] Remove content app and move to core --- .secrets.baseline | 4 ++-- content/__init__.py | 0 content/apps.py | 6 ------ content/context_processors.py | 5 ----- content/migrations/__init__.py | 0 {content => core}/constants.py | 0 core/context_processors.py | 6 ++++++ core/settings.py | 3 +-- qfdmo/forms.py | 2 +- 9 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 content/__init__.py delete mode 100644 content/apps.py delete mode 100644 content/context_processors.py delete mode 100644 content/migrations/__init__.py rename {content => core}/constants.py (100%) diff --git a/.secrets.baseline b/.secrets.baseline index 2636227ad..f434edeab 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -151,7 +151,7 @@ "filename": "core/settings.py", "hashed_secret": "1ee34e26aeaf89c64ecc2c85efe6a961b75a50e9", "is_verified": false, - "line_number": 210 + "line_number": 209 } ], "docker-compose.yml": [ @@ -207,5 +207,5 @@ } ] }, - "generated_at": "2024-11-18T10:26:49Z" + "generated_at": "2024-11-19T08:59:11Z" } diff --git a/content/__init__.py b/content/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/content/apps.py b/content/apps.py deleted file mode 100644 index 087ec170c..000000000 --- a/content/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class ContentConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "content" diff --git a/content/context_processors.py b/content/context_processors.py deleted file mode 100644 index bd4ff5b27..000000000 --- a/content/context_processors.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import constants - - -def content(request): - return vars(constants) diff --git a/content/migrations/__init__.py b/content/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/content/constants.py b/core/constants.py similarity index 100% rename from content/constants.py rename to core/constants.py diff --git a/core/context_processors.py b/core/context_processors.py index 50e56b09e..0d739f61f 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -1,5 +1,7 @@ from django.conf import settings +from . import constants + def environment(request): return { @@ -7,3 +9,7 @@ def environment(request): "DEBUG": settings.DEBUG, "is_embedded": True, } + + +def content(request): + return vars(constants) diff --git a/core/settings.py b/core/settings.py index 1b9220393..214ac51b4 100644 --- a/core/settings.py +++ b/core/settings.py @@ -53,7 +53,6 @@ "dsfr", "django.forms", "colorfield", - "content", "core", "qfdmd", "qfdmo", @@ -165,7 +164,7 @@ def context_processors(): "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", "core.context_processors.environment", - "content.context_processors.content", + "core.context_processors.content", "dsfr.context_processors.site_config", ] diff --git a/qfdmo/forms.py b/qfdmo/forms.py index 4f89ba48f..92a30cb08 100644 --- a/qfdmo/forms.py +++ b/qfdmo/forms.py @@ -7,7 +7,7 @@ from django.utils.safestring import mark_safe from dsfr.forms import DsfrBaseForm -from content.constants import bonus_reparation +from core.constants import bonus_reparation from qfdmo.fields import GroupeActionChoiceField from qfdmo.geo_api import epcis_from, formatted_epcis_as_list_of_tuple from qfdmo.models import DagRun, DagRunStatus, SousCategorieObjet