Page show lexique : On filtre les labels visibles

templates/entry/_chooseLabel.html.twig

@@ -9,7 +9,7 @@
         <div class="row mb-3">
             <div class="col-md-12">
 
-                {% for label in entry.headword.labelsForCategory(category) %}
+                {% for label in label_manager.entryVisibleLabels(entry, app.user, category) %}
                     {% include "label/_labelBadge.html.twig" %}
                     <a class="ajax-link" href="#" data-method="DELETE" data-url="{{ path('label_remove', {id: label.id}) }}" data-json="{{ {headwords_ids: [entry.headword.id]}|json_encode }}">
                         <i class="fa fa-lg fa-times-circle text-danger" style="margin-left: -8px; margin-right: 5px;"></i>

templates/lexicon/show.html.twig

@@ -86,7 +86,7 @@
                                     {# @var entry \App\Entity\Entry #}
                                     {% set known = entry.headword.knownByUser(app.user) %}
                                     <tr class="{{ known ? 'headword-known' }}">
-                                        <td class="col-md-1">{{entry.addingOrder }}</td>
+                                        <td class="col-md-1">{{entry.addingOrder + 1 }}</td>
                                         <td class="d-flex justify-content-between">
                                             {# "value" est utilisé par Symfo quand on soumet le form. "data-headword-id" est utilisé par la vue chooseLabel pour injecter du json dans le sliens ajax #}
                                             <div>
@@ -103,13 +103,13 @@
                                         </td>
     {#                                    <td>{% for label in entry.headword.morphologicalLabels %}<span class="badge bg-primary">{{ label }}</span> {% endfor %}</td>#}
                                         <td class="col-md-2 modal-form" data-url="{{ path('app_entry_choose_label', {id: entry.id, category: constant("App\\Entity\\Label::LABEL_CATEGORY_GENERAL")}) }}">
-                                            {% for label in entry.headword.generalLabels %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
+                                            {% for label in label_manager.entryVisibleLabels(entry, app.user, constant("App\\Entity\\Label::LABEL_CATEGORY_GENERAL")) %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
                                         </td>
                                         <td class="col-md-2 modal-form" data-url="{{ path('app_entry_choose_label', {id: entry.id, category: constant("App\\Entity\\Label::LABEL_CATEGORY_INSTITUTIONAL")}) }}">
-                                            {% for label in entry.headword.institutionalLabels %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
+                                            {% for label in label_manager.entryVisibleLabels(entry, app.user, constant("App\\Entity\\Label::LABEL_CATEGORY_INSTITUTIONAL")) %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
                                         </td>
                                         <td class="col-md-2 modal-form" data-url="{{ path('app_entry_choose_label', {id: entry.id, category: constant("App\\Entity\\Label::LABEL_CATEGORY_MILESTONE")}) }}">
-                                            {% for label in entry.headword.milestoneLabels %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
+                                            {% for label in label_manager.entryVisibleLabels(entry, app.user, constant("App\\Entity\\Label::LABEL_CATEGORY_MILESTONE")) %}<span class="blink-target">{% include "label/_labelBadge.html.twig" %}</span>{% endfor %}
                                         </td>
                                         <td>
                                             {% for pos, definition in entry.formattedDefinitions %}