diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4acd264..c58ce78b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,10 +48,9 @@ and this project adheres to * [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465) * [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460) + ## Test releases * Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType -* [renderbox]: Fix display of address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/462) -* [renderbox]: Add email in personRenderBox, this was not yet displayed. ### test release 2022-02-14 diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig index 44bcf5cbc..847ddd388 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig @@ -24,8 +24,8 @@
{% if document.date is not null %} -
- {{ document.createdAt|format_date('short') }} +
+ {{ document.date|format_date('short') }}
{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss index c42c592a9..37d4f97c4 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -72,7 +72,7 @@ section.chill-entity { } } p { - // display: inline-block; + display: inline-block; margin: 0 0 0 1.5em; text-indent: -1.5em; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index d87e0f50c..f77f006db 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -113,15 +113,6 @@

{{ $t('renderbox.no_data') }}

-
  • - - {{ person.email }} -
  • -
  • - -

    {{ $t('renderbox.no_data') }}

    -
  • -
  • diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig index cbfd7660b..3df3f9afb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig @@ -8,7 +8,7 @@ {% endif %} {% if entity.updatedBy != null %} {% if entity.updatedAt != null %} - {{ ', ' ~ 'by_user'|trans }} + {{ ', ' }}
    {{ 'by_user'|trans }} {% else %} {{ 'Last updated by'|trans }} {% endif %} @@ -29,7 +29,7 @@ {% endif %} {% if entity.createdBy != null %} {% if entity.createdAt != null %} - {{ ', ' ~ 'by_user'|trans }} + {{ ', ' }}
    {{ 'by_user'|trans }} {% else %} {{ 'Created by'|trans }} {% endif %}