From 37b73d0bacf3eeb53eaa6223d46cb27038f9765c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20BOYER?= <t.boyer@si17.lan>
Date: Thu, 8 Feb 2024 17:35:18 +0100
Subject: [PATCH] Fix Divers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- MAJ affichage des actions de protection liées dans une AIPD et dans la conformité de la structure
- Fix traductions
- Fix affichage champ obligatoire
- Fix visualisation du commentaire dans une preuve en élément lié
- Fix fil d'Ariane nouvelle AIPD
- Fix blocs générés en PDF
- Fix condition Sort Final
---
.../domain/aipd/translations/messages.fr.yaml | 1 +
.../registry/translations/messages.fr.yaml | 2 ++
.../Twig/Extension/AnalyseImpactExtension.php | 4 ++--
src/Domain/Registry/Form/Type/ProofType.php | 2 +-
.../Aipd/Analyse_impact/_form_step_2.html.twig | 8 ++++++--
templates/Aipd/Analyse_impact/create.html.twig | 7 +++++++
templates/Aipd/Analyse_impact/pdf.html.twig | 12 ++++++------
.../Documentation/Document/grid.html.twig | 6 +++---
.../Conformite_organisation/list.html.twig | 16 +++++++++++-----
.../Conformite_traitement/list.html.twig | 4 ++--
templates/Registry/Proof/list.html.twig | 2 +-
.../Registry/Treatment/archive_all.html.twig | 2 +-
templates/Registry/Treatment/pdf.html.twig | 18 +++++++++---------
templates/Registry/Treatment/pdf_all.html.twig | 18 +++++++++---------
.../Registry/Treatment/public_list.html.twig | 2 +-
.../Registry/Treatment/public_show.html.twig | 2 +-
templates/Registry/Treatment/show.html.twig | 2 +-
templates/User/Profile/user_edit.html.twig | 2 +-
templates/_Utils/_show_block_proofs.html.twig | 1 -
translations/messages.fr.yaml | 1 +
20 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/config/domain/aipd/translations/messages.fr.yaml b/config/domain/aipd/translations/messages.fr.yaml
index 29b5ac935..dd87c795a 100644
--- a/config/domain/aipd/translations/messages.fr.yaml
+++ b/config/domain/aipd/translations/messages.fr.yaml
@@ -117,6 +117,7 @@ aipd:
validation: Valider une AIPD
breadcrumb:
list: Liste des analyses d'impacts
+ create: Créer une AIPD
edit: Modifier une AIPD
delete: Supprimer une AIPD
evaluation: Évaluer une AIPD
diff --git a/config/domain/registry/translations/messages.fr.yaml b/config/domain/registry/translations/messages.fr.yaml
index 9c796dc5f..40b5013f7 100644
--- a/config/domain/registry/translations/messages.fr.yaml
+++ b/config/domain/registry/translations/messages.fr.yaml
@@ -434,6 +434,8 @@ registry:
traitement: Traitement
date_conformite: Date de l'évaluation
date_aipd: Date de l'AIPD
+ mesurements_done: "Actions de protection appliquées :"
+ aipd_to_do: Une AIPD doit être réalisée sur ce traitement
action:
show_conformite_traitement: Évaluer
new_submit: Créer l'évaluation du traitement
diff --git a/src/Domain/AIPD/Twig/Extension/AnalyseImpactExtension.php b/src/Domain/AIPD/Twig/Extension/AnalyseImpactExtension.php
index b2b0d0fb0..1faecb6ba 100644
--- a/src/Domain/AIPD/Twig/Extension/AnalyseImpactExtension.php
+++ b/src/Domain/AIPD/Twig/Extension/AnalyseImpactExtension.php
@@ -45,11 +45,11 @@ class AnalyseImpactExtension extends AbstractExtension
$reponseConformite = $questionAnalyse->getAnalyseImpact()->getConformiteTraitement()->getReponseOfName($questionAnalyse->getQuestion());
$formattedString = '';
if (!$reponseConformite) {
- return '<a href="/conformite-traitement/modifier/' . $questionAnalyse->getAnalyseImpact()->getConformiteTraitement()->getId()->toString() . '">Veuillez évaluer à nouveau la conformité du traitement</a>';
+ return '<li><a href="/conformite-traitement/modifier/' . $questionAnalyse->getAnalyseImpact()->getConformiteTraitement()->getId()->toString() . '">Veuillez évaluer à nouveau la conformité du traitement</a></li>';
}
/** @var Mesurement $actionProtection */
foreach ($reponseConformite->getActionProtections() as $actionProtection) {
- $formattedString .= $actionProtection->getName() . '<br/>';
+ $formattedString .= '<li><a target="_blank" href="/actions-de-protection/visualiser/' . $actionProtection->getId() . '">' . $actionProtection->getName() . '</a></li>';
}
return $formattedString;
diff --git a/src/Domain/Registry/Form/Type/ProofType.php b/src/Domain/Registry/Form/Type/ProofType.php
index 902c30a91..476138cbd 100644
--- a/src/Domain/Registry/Form/Type/ProofType.php
+++ b/src/Domain/Registry/Form/Type/ProofType.php
@@ -89,7 +89,7 @@ class ProofType extends AbstractType
])
->add('documentFile', FileType::class, [
'label' => 'registry.proof.label.file',
- 'required' => false,
+ 'required' => true,
'constraints' => [
new File([
'maxSize' => $this->maxSize,
diff --git a/templates/Aipd/Analyse_impact/_form_step_2.html.twig b/templates/Aipd/Analyse_impact/_form_step_2.html.twig
index e5c37d4e8..db2944250 100644
--- a/templates/Aipd/Analyse_impact/_form_step_2.html.twig
+++ b/templates/Aipd/Analyse_impact/_form_step_2.html.twig
@@ -11,10 +11,14 @@
{% for question in form.questionConformites|sort((a, b) => a.vars.value.position > b.vars.value.position) %}
<tr>
<td>{{ question.vars.value.question }}</td>
+ <td>{{ (getConformiteLabel(question.vars.value))|raw }}</td>
<td>
- {{ (getConformiteLabel(question.vars.value))|raw }}
+ {% if getFormattedActionProtectionsFromQuestion(question.vars.value)|length > 0 %}
+ <ul class="ps-1">
+ {{ getFormattedActionProtectionsFromQuestion(question.vars.value)|raw }}
+ </ul>
+ {% endif %}
</td>
- <td>{{ getFormattedActionProtectionsFromQuestion(question.vars.value)|raw }}</td>
{% set isRequired = question.vars.value.justificationObligatoire %}
<td><span {% if(isRequired == 0) %}style="visibility: hidden"{% endif %}>{{ form_widget(question.justificatif, {'required': isRequired}) }}</span></td>
</tr>
diff --git a/templates/Aipd/Analyse_impact/create.html.twig b/templates/Aipd/Analyse_impact/create.html.twig
index 73ab7d536..86a451a50 100644
--- a/templates/Aipd/Analyse_impact/create.html.twig
+++ b/templates/Aipd/Analyse_impact/create.html.twig
@@ -10,6 +10,13 @@
<link rel="stylesheet" href="//cdn.datatables.net/buttons/1.6.2/css/buttons.dataTables.min.css">
{% endblock %}
+{% block breadcrumb %}
+ {% set breadcrumb = [
+ { 'name': 'aipd.analyse_impact.breadcrumb.list'|trans, 'link': path('aipd_analyse_impact_list') },
+ { 'name': 'aipd.analyse_impact.breadcrumb.create'|trans }
+ ] %}
+ {% include '_breadcrumb.html.twig' with {'breadcrumb': breadcrumb} %}
+{% endblock %}
{% block body_head %}
<h1>
diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig
index 656ba938c..db86e5c3c 100644
--- a/templates/Aipd/Analyse_impact/pdf.html.twig
+++ b/templates/Aipd/Analyse_impact/pdf.html.twig
@@ -534,7 +534,7 @@
<div class="reportGraph"><canvas id="mesuresSecurite-chart"></canvas></div>
<div class="box box-solid box-primary">
<div class="box-header with-border">Mesures de protection</div>
- <table class="table table-bordered" style="page-break-inside: avoid">
+ <table class="table table-bordered">
<tr>
<th>Mesure</th>
<th>Avis sur les mesures existantes</th>
@@ -578,7 +578,7 @@
<div class="box box-solid box-primary">
<div class="box-header with-border">{{ 'aipd.analyse_impact.tab.gestion_risques'|trans }}</div>
<div class="box-body">
- <table class="table table-bordered" style="page-break-inside: avoid">
+ <table class="table table-bordered">
<tr>
<th>{{ 'aipd.modele_analyse.label.scenario'|trans }}</th>
<th style="width: 20%;">{{ 'aipd.analyse_impact.label.impact_potentiel'|trans }}</th>
@@ -608,7 +608,7 @@
<div class="box box-solid box-primary">
<div class="box-header with-border">Actions conseillées par le DPD à mettre en place</div>
<div class="box-body">
- <table class="table table-bordered" style="page-break-inside: avoid">
+ <table class="table table-bordered">
<tr>
<th>Mesure</th>
<th>Préconisations</th>
@@ -627,7 +627,7 @@
<div>Ce chapitre a pour objectifs de permettre la prise de décision visant à accepter ou non l'AIPD au regard des résultats de l'étude.</div>
<h3>Avis des personnes consultées</h3>
- <table class="table table-bordered" style="page-break-inside: avoid">
+ <table class="table table-bordered">
<tr>
<td class="table-bluecell">Avis du référent RGPD</td>
<td>{{ object.avisReferent.reponse|dictionary('reponse_avis') }}</td>
@@ -1101,7 +1101,7 @@
<tr>
<td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
<td style="padding-top: 10px; width: 80%">
- {% for method in object.shelfLifes %}
+ {% for method in traitement.shelfLifes %}
<div class="box box-default">
<div class="box-body no-padding">
<table class="table">
@@ -1116,7 +1116,7 @@
</tr>
<tr>
<th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
</tr>
</tbody>
</table>
diff --git a/templates/Documentation/Document/grid.html.twig b/templates/Documentation/Document/grid.html.twig
index e342bb79a..d1d116f19 100644
--- a/templates/Documentation/Document/grid.html.twig
+++ b/templates/Documentation/Document/grid.html.twig
@@ -101,7 +101,7 @@
<div class="row">
{# SWITCH GRID LIST #}
{% if is_granted('ROLE_USER') %}
- <div class="col-md-12 col-xl-2">
+ <div class="col-xs-12">
<div class="ml2">
<a href="{{ path('documentation_document_list') }}" class="btn btn-default">
<i aria-hidden="true" class="fas fa-list"></i>
@@ -114,7 +114,7 @@
</div>
<div class="ml2">
<input type="checkbox" class="form-check-input" id="search_favorite">
- <label class="form-check-label" for="search_favorite">{{ 'documentation.document.label.name'|trans }}</label>
+ <label class="form-check-label" for="search_favorite">{{ 'documentation.document.list.favorite'|trans }}</label>
</div>
<div class="ml2">
<select class="form-control" id="search_type" style="width: 100%;">
@@ -127,7 +127,7 @@
<div class="ml2">
<input class="form-control" type="text" id="search_name" placeholder="{{ 'documentation.document.label.name'|trans }}" style="width: 100%;">
</div>
- <div class="ml2">
+ <div class="ml2" style="min-width: 180px;">
<select class="form-control selectpicker" id="search_category" style="width: 100%;" multiple>
{% for category in categories %}
{% if category.name in activeCategories %}
diff --git a/templates/Registry/Conformite_organisation/list.html.twig b/templates/Registry/Conformite_organisation/list.html.twig
index 35bf9e063..703aacca8 100644
--- a/templates/Registry/Conformite_organisation/list.html.twig
+++ b/templates/Registry/Conformite_organisation/list.html.twig
@@ -76,11 +76,17 @@
<span style="width: 50px;" class="badge {{ type }}">{{ conformite.vars.value.conformite }} / 5</span>
</td>
<td style="vertical-align: middle">
- <ul>
- {% for action in conformite.vars.value.NonAppliedActionProtections %}
- <li>{{ action.name }}</li>
- {% endfor %}
- </ul>
+ {% if conformite.vars.value.NonAppliedActionProtections|length > 0 %}
+ <ul class="ps-1">
+ {% for action in conformite.vars.value.NonAppliedActionProtections %}
+ <li>
+ <a href="{{ path('registry_mesurement_show', { id: action.id }) }}">
+ {{ action.name }} ({{ action.status|dictionary('registry_mesurement_status') }})
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
</td>
</tr>
{% endfor %}
diff --git a/templates/Registry/Conformite_traitement/list.html.twig b/templates/Registry/Conformite_traitement/list.html.twig
index 48642c0b7..7520cd2b2 100644
--- a/templates/Registry/Conformite_traitement/list.html.twig
+++ b/templates/Registry/Conformite_traitement/list.html.twig
@@ -84,7 +84,7 @@
<div class="mesurement-hide">
<i aria-hidden="true" class="primary-i fas fa-exclamation-circle"></i>
<div class="primary">
- <span>Action de protections appliquées : </span>
+ <span>{{ 'registry.conformite_traitement.list.mesurements_done'|trans }}</span>
<ul>
{% for mesurement in planifiedMesurementToBeNotified %}
<li>{{ mesurement.name }}</li>
@@ -96,7 +96,7 @@
{% if conformiteTraitement and conformiteTraitement.needsAipd and analyseImpact is null %}
<div>
- <i aria-hidden="true" class="fa fa-exclamation-triangle" title="Une AIPD doit être réalisée sur ce traitement." style="color:#f39c12;"></i>
+ <i aria-hidden="true" class="fa fa-exclamation-triangle" title="{{ 'registry.conformite_traitement.list.mesurements_done'|trans }}" style="color:#f39c12;"></i>
</div>
{% endif %}
</td>
diff --git a/templates/Registry/Proof/list.html.twig b/templates/Registry/Proof/list.html.twig
index d6d1605a1..bf85daf24 100644
--- a/templates/Registry/Proof/list.html.twig
+++ b/templates/Registry/Proof/list.html.twig
@@ -138,7 +138,7 @@
{"data": "nom"},
{"data": "type"},
{"data": "commentaire"},
- {"data": "date"},
+ {"data": "date", "visible": false},
{"data": "updatedAt", "visible": false},
{"data": "actions", "className": "noVis", "orderable": false},
] %}
diff --git a/templates/Registry/Treatment/archive_all.html.twig b/templates/Registry/Treatment/archive_all.html.twig
index be16c2771..7f6a18e49 100644
--- a/templates/Registry/Treatment/archive_all.html.twig
+++ b/templates/Registry/Treatment/archive_all.html.twig
@@ -32,7 +32,7 @@
{{ 'global.action.back_to_list'|trans }}
</a>
<a href="{{ path('registry_treatment_archive_all_confirm', { 'ids': ids }) }}" class="btn btn-primary">
- {{ 'global.action.confirm_archive'|trans }}
+ {{ 'global.action.confirm_deactivate'|trans }}
</a>
</div>
</div>
diff --git a/templates/Registry/Treatment/pdf.html.twig b/templates/Registry/Treatment/pdf.html.twig
index 6d0818eaa..98c97dab6 100644
--- a/templates/Registry/Treatment/pdf.html.twig
+++ b/templates/Registry/Treatment/pdf.html.twig
@@ -7,7 +7,7 @@
{% block body %}
{# GENERAL #}
- <div class="box box-solid box-info" style="page-break-inside: avoid">
+ <div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -79,7 +79,7 @@
{# DPO Statut #}
{% if object.dpoMessage is not null %}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
</div>
@@ -90,7 +90,7 @@
{% endif %}
{# DATA CATEGORY #}
- <div class="box box-solid box-warning" style="page-break-inside: avoid">
+ <div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -119,7 +119,7 @@
</div>
{# RECIPIENTS #}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -144,7 +144,7 @@
</div>
{# SPECIFIC #}
- <div class="box box-solid box-info" style="page-break-inside: avoid">
+ <div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
<div class="box-body no-padding">
<table role="presentation" class="table">
@@ -244,7 +244,7 @@
</div>
{# DETAILS #}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -412,7 +412,7 @@
</tr>
<tr>
<th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
</tr>
</tbody>
</table>
@@ -476,7 +476,7 @@
</div>
{# SECURITY #}
- <div class="box box-solid box-success" style="page-break-inside: avoid">
+ <div class="box box-solid box-success">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -687,7 +687,7 @@
{% endif %}
{# HISTORIC #}
- <div class="box box-solid box-default" style="page-break-inside: avoid">
+ <div class="box box-solid box-default">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
diff --git a/templates/Registry/Treatment/pdf_all.html.twig b/templates/Registry/Treatment/pdf_all.html.twig
index 81f329b60..d1e05ed4b 100644
--- a/templates/Registry/Treatment/pdf_all.html.twig
+++ b/templates/Registry/Treatment/pdf_all.html.twig
@@ -9,7 +9,7 @@
<div style="page-break-after: always">
<h1 class="text-center">{{ object.name }}</h1>
{# GENERAL #}
- <div class="box box-solid box-info" style="page-break-inside: avoid">
+ <div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.general'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -81,7 +81,7 @@
{# DPO Statut #}
{% if object.dpoMessage is not null %}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
</div>
@@ -92,7 +92,7 @@
{% endif %}
{# DATA CATEGORY #}
- <div class="box box-solid box-warning" style="page-break-inside: avoid">
+ <div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -121,7 +121,7 @@
</div>
{# RECIPIENTS #}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -146,7 +146,7 @@
</div>
{# SPECIFIC #}
- <div class="box box-solid box-info" style="page-break-inside: avoid">
+ <div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
<div class="box-body no-padding">
<table role="presentation" class="table">
@@ -246,7 +246,7 @@
</div>
{# DETAILS #}
- <div class="box box-solid box-primary" style="page-break-inside: avoid">
+ <div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -414,7 +414,7 @@
</tr>
<tr>
<th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
</tr>
</tbody>
</table>
@@ -478,7 +478,7 @@
</div>
{# SECURITY #}
- <div class="box box-solid box-success" style="page-break-inside: avoid">
+ <div class="box box-solid box-success">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
@@ -689,7 +689,7 @@
{% endif %}
{# HISTORIC #}
- <div class="box box-solid box-default" style="page-break-inside: avoid">
+ <div class="box box-solid box-default">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.history'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
diff --git a/templates/Registry/Treatment/public_list.html.twig b/templates/Registry/Treatment/public_list.html.twig
index f40edb8bf..79d0258c6 100644
--- a/templates/Registry/Treatment/public_list.html.twig
+++ b/templates/Registry/Treatment/public_list.html.twig
@@ -17,7 +17,7 @@
{% if app.request.query.get('active') == 'true' %}
{{ 'registry.treatment.title.list_active'|trans }}
{% else %}
- {{ 'registry.treatment.title.list_inactive'|trans }}c
+ {{ 'registry.treatment.title.list_inactive'|trans }}
{% endif %}
</small>
</h1>
diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig
index 915f95172..86fac94af 100644
--- a/templates/Registry/Treatment/public_show.html.twig
+++ b/templates/Registry/Treatment/public_show.html.twig
@@ -660,7 +660,7 @@
</tr>
<tr>
<th scope="row" class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
</tr>
</tbody>
</table>
diff --git a/templates/Registry/Treatment/show.html.twig b/templates/Registry/Treatment/show.html.twig
index 8213edcdf..a256de7ef 100644
--- a/templates/Registry/Treatment/show.html.twig
+++ b/templates/Registry/Treatment/show.html.twig
@@ -501,7 +501,7 @@
</tr>
<tr>
<th scope="row" class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
</tr>
</tbody>
</table>
diff --git a/templates/User/Profile/user_edit.html.twig b/templates/User/Profile/user_edit.html.twig
index a845a69a6..c1c549f7b 100644
--- a/templates/User/Profile/user_edit.html.twig
+++ b/templates/User/Profile/user_edit.html.twig
@@ -101,7 +101,7 @@
</div>
<div class="box-body">
<div class="callout callout-default text-muted">
- {{ 'user.security.label.help.password'|trans }}
+ {{ 'user.security.label.help.new_password'|trans }}
</div>
{{ form_row(form.plainPassword) }}
</div>
diff --git a/templates/_Utils/_show_block_proofs.html.twig b/templates/_Utils/_show_block_proofs.html.twig
index 780598180..223390ff8 100644
--- a/templates/_Utils/_show_block_proofs.html.twig
+++ b/templates/_Utils/_show_block_proofs.html.twig
@@ -9,7 +9,6 @@
{% if proof.deletedAt is not null %}({{ 'global.label.archived'|trans }}){% endif %}
{{ proof.name }} ({{ proof.type|dictionary('registry_proof_type') }})
</a>
- {{ proof.comment }}
</li>
{% endfor %}
</ul>
diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml
index b9007e1ec..db81f4d79 100644
--- a/translations/messages.fr.yaml
+++ b/translations/messages.fr.yaml
@@ -8,6 +8,7 @@ global:
close: Fermer
cancel: Annuler
confirm: Confirmer
+ confirm_deactivate: Confirmer la désactivation
confirm_archive: Confirmer l'archivage
confirm_delete: Confirmer la suppression
confirm_unarchive: Confirmer le désarchivement
--
GitLab