Fix merge labels

src/Controller/LabelController.php

@@ -85,6 +85,7 @@ class LabelController extends AppBaseController
             if ($identicalLabel) {
                 $this->addFlash('warning', sprintf("Création impossible. Un label identique existe déjà."));
             } else {
+                $this->em->persist($label);
                 $this->em->flush();
                 $this->addFlash('success', "Le label a été ajouté");
 
@@ -92,8 +93,8 @@ class LabelController extends AppBaseController
             }
         }
 
-        return $this->render('genericModalForm.html.twig', [
-            'title' => "Créer un label",
+        return $this->render('label/edit.html.twig', [
+            'label' => $label,
             'form' => $form->createView(),
         ]);
     }

templates/label/_labelBadge.html.twig

 <div class="badge rounded-pill {{ label.isMilestone ? 'badge-milestone'}} position-relative text-black {{ label|labelClass }}
         {{ label.isMilestone or label.isInstitutional or label.isMasterPublic ? 'border-auto'}}" style="margin-right: 5px;"
-        title="{{ label.description }}. Updated: {{ label.updatedAt|date('d/m/Y') }}">
+        title="{{ label.description ? label.description~'.' : }} Updated: {{ label.updatedAt|date('d/m/Y') }}">
     {{ label }}
     {% if label.isMilestone %}<br>{{ label.getMilestone|date('d/m/Y') }}{% endif %}
     {% if showHeadwordsCounter|default(false) %}

templates/label/_lexiconsHeaders.html.twig

@@ -7,6 +7,8 @@
 <tr>
     <td></td>
     {% for lexicon in app.user.myLexicons %}
-        <td class="text-center col-collapse {{ (showVisibility|default(false) != category) ? 'hidden-column' }}">{{ lexicon|badge }}</td>
+        <td class="text-center col-collapse {{ (showVisibility|default(false) != category) ? 'hidden-column' }}">
+            <a href="{{ path('app_lexicon_show', {id: app.user.lexicon.id}) }}" title=" {{ "Lexique du groupe"|trans }} « {{ lexicon }} »">{{ lexicon|badge }}</a>
+        </td>
     {% endfor %}
 </tr>
\ No newline at end of file

templates/label/edit.html.twig

@@ -24,7 +24,7 @@
             <div class="row pt-3">
                 <div class="col-sm-4"></div>
                 <div class="col-sm-8">
-                    {% if displayForceValidation %}
+                    {% if displayForceValidation|default(false) %}
                         {{ form_widget(form.forceValidation) }}
                     {% else %}
                         {{ form_widget(form.submit) }}

templates/label/show.html.twig

@@ -10,7 +10,7 @@
             <div class="col-md-12">
 
                 <h1 class="my-3">
-                    <i class="fa fa-tag"></i> {{ "Labels"|trans }}
+                    <i class="fa fa-tag"></i> {{ "Label"|trans }}
                 </h1>
 
                 <div class="row">
@@ -66,7 +66,7 @@
                                     <th class="text-center">
                                         <div class="d-flex justify-content-around align-items-center">
                                             <span>{{ "Mots-vedettes"|trans }}</span>
-                                            <a title="{{ "Ajouter"|trans }}" href="#" data-url="{{ path('app_label_add_headword', {id: label.id}) }}" class="ms-2 modal-form"><i class="fa fa-plus-circle text-success"></i></a>
+                                            <a title="{{ "Ajouter le label à un autre mot-vedette"|trans }}" href="#" data-url="{{ path('app_label_add_headword', {id: label.id}) }}" class="ms-2 modal-form"><i class="fa fa-plus-circle text-success"></i></a>
                                     </th>
                                     <th colspan="{{ lexiconsNb }}" class="text-center">{{ "Présence des mots dans les lexiques"|trans }}</th>
                                 </tr>