Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -12,6 +12,7 @@
     * hLevel        integer
     * addDeath      bool
     * addAgeBadge   bool
+    * suffixText    bool
     * address_multiline     bool
     * customButtons [
         'before'    Twig\Markup, (injected with macro)
@@ -46,6 +47,11 @@
         <span>({{- 'years_old'|trans({ 'age': person.age }) -}})</span>
         {% endif %}
     {% endif %}
+    {%- if options['suffixText'] is defined -%}
+        {% for o in options['suffixText'] %}
+            <span>{{ o }}</span>
+        {% endfor %}
+    {% endif %}
 {% endmacro raw %}
 
 {% macro label(person, options) %}

src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig

@@ -3,10 +3,27 @@
         {{ 'Last updated on'|trans }}
         <span class="date">
             {{ entity.updatedAt|format_datetime('medium', 'short') }}
-        </span>,
-        {{ 'by_user'|trans }}
-        <span class="user">
-            {{ entity.updatedBy|chill_entity_render_box }}
         </span>
+        {% if entity.updatedBy %}
+            {{ ', ' ~ 'by_user'|trans }}
+            <span class="user">
+                {{ entity.updatedBy|chill_entity_render_box }}
+            </span>
+        {% endif %}
+    </div>
+{% endmacro %}
+
+{% macro createdBy(entity) %}
+    <div class="updatedBy">
+        {{ 'Created on'|trans }}
+        <span class="date">
+            {{ entity.createdAt|format_datetime('medium', 'short') }}
+        </span>
+        {% if entity.createdBy %}
+            {{ ', ' ~ 'by_user'|trans }}
+            <span class="user">
+                {{ entity.createdBy|chill_entity_render_string }}
+            </span>
+        {% endif %}
     </div>
 {% endmacro %}