From 54535089b46d41ddb3050223656ff1dd1e39b03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jime=CC=81nez=20Alvarez?= Date: Thu, 25 Sep 2014 12:37:27 +0200 Subject: [PATCH] This templates throw an error when data is a array. --- .../Resources/views/Audit/compare.html.twig | 38 +++++++++++++++++-- .../views/Audit/view_detail.html.twig | 6 +++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig b/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig index 71829559..5cd8baca 100644 --- a/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig +++ b/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig @@ -14,12 +14,42 @@ {% for field, value in diff %} {{ field }} - {{ value.old }} - {{ value.same }} - {{ value.new }} + + {% if value.old.timestamp is defined %} + {{ value.old|date('m/d/Y') }} + {% elseif value.old is iterable %} + {% for element in value.old %} + {{ element }} + {% endfor %} + {% else %} + {{ value.old }} + {% endif %} + + + {% if value.same.timestamp is defined %} + {{ value.same|date('m/d/Y') }} + {% elseif value.same is iterable %} + {% for element in value.same %} + {{ element }} + {% endfor %} + {% else %} + {{ value.same }} + {% endif %} + + + {% if value.new.timestamp is defined %} + {{ value.new|date('m/d/Y') }} + {% elseif value.new is iterable %} + {% for element in value.new %} + {{ element }} + {% endfor %} + {% else %} + {{ value.new }} + {% endif %} + {% endfor %} -{% endblock simplethings_entityaudit_content %} \ No newline at end of file +{% endblock simplethings_entityaudit_content %} diff --git a/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig b/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig index d44a9536..ec34a4fd 100644 --- a/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig +++ b/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig @@ -15,6 +15,12 @@ {{ field }} {% if value.timestamp is defined %} {{ value|date('m/d/Y') }} + {% elseif value is iterable %} + + {% for element in value %} + {{ element }} + {% endfor %} + {% else %} {{ value }} {% endif %}