From 4cbb4c3ae32bc4207b143fc526674a64f821abec Mon Sep 17 00:00:00 2001 From: LenaertsJ Date: Fri, 5 Dec 2025 12:39:12 +0000 Subject: [PATCH] Show whether doc generation template is active or not + order alphabetically --- .changes/unreleased/UX-20251103-161910.yaml | 6 ++++++ .../AdminDocGeneratorTemplateController.php | 2 +- .../views/DocGeneratorTemplate/index.html.twig | 14 +++++++++++++- .../translations/messages.fr.yml | 4 ++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .changes/unreleased/UX-20251103-161910.yaml diff --git a/.changes/unreleased/UX-20251103-161910.yaml b/.changes/unreleased/UX-20251103-161910.yaml new file mode 100644 index 000000000..5ef8ff4e9 --- /dev/null +++ b/.changes/unreleased/UX-20251103-161910.yaml @@ -0,0 +1,6 @@ +kind: UX +body: Display whether doc generation template is active or not in admin and order templates alphabetically +time: 2025-11-03T16:19:10.051947925+01:00 +custom: + Issue: "456" + SchemaChange: No schema change diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php index 04fa9ce07..8a45ff963 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php @@ -87,7 +87,7 @@ class AdminDocGeneratorTemplateController extends CRUDController */ protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator) { - return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang') + return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang') ->setParameter('lang', $request->getLocale()) ->addOrderBy('name_lang', 'ASC'); } diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig index ee167bcf7..24bc94d1c 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig +++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig @@ -25,12 +25,24 @@
-

{{ entity.name|localize_translatable_string }}

+

{{ entity.name|localize_translatable_string }}

+

+ {% if entity.active %} + {{ 'admin.active'|trans }} + {% else %} + {{ 'admin.not active'|trans }} + {% endif %} +

{{ contextManager.getContextByKey(entity.context).name|trans }}

+{#
#} +{#
#} +{##} +{#
#} +{#
#}
    diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml index c1601ea6e..f883ce3d0 100644 --- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml @@ -49,3 +49,7 @@ crud: Template file: Fichier modèle + +admin: + active: Actif + not active: Non-actif