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 1/2] 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 %} From e5b7a4b17532b3e92da2e6d9e56d685cdd6a94df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jime=CC=81nez=20Alvarez?= Date: Fri, 26 Sep 2014 11:20:37 +0200 Subject: [PATCH 2/2] Views improvement for the controllers. Now, the view know how to deals with iterable values an date values. --- .../Resources/views/Audit/compare.html.twig | 46 ++++++++----------- .../views/Audit/view_detail.html.twig | 9 ++-- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig b/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig index 5cd8baca..6d69be23 100644 --- a/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig +++ b/src/SimpleThings/EntityAudit/Resources/views/Audit/compare.html.twig @@ -1,5 +1,21 @@ {% extends "SimpleThingsEntityAuditBundle::layout.html.twig" %} +{% macro showValue(value) %} + {% if value.timestamp is defined %} + {{ value|date('m/d/Y') }} + {% elseif value is iterable %} + + {% else %} + {{ value }} + {% endif %} +{% endmacro %} + +{% import _self as helper %} + {% block simplethings_entityaudit_content %}

Comparing {{ className }} with identifiers of {{ id }} between revisions {{ oldRev }} and {{ newRev }}

@@ -15,37 +31,13 @@ {{ field }} - {% 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 %} + {{ helper.showValue(value.old) }} - {% 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 %} + {{ helper.showValue(value.same) }} - {% 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 %} + {{ helper.showValue(value.new) }} {% endfor %} 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 ec34a4fd..a5a3369b 100644 --- a/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig +++ b/src/SimpleThings/EntityAudit/Resources/views/Audit/view_detail.html.twig @@ -17,9 +17,11 @@ {{ value|date('m/d/Y') }} {% elseif value is iterable %} - {% for element in value %} - {{ element }} - {% endfor %} + {% else %} {{ value }} @@ -30,3 +32,4 @@ {% endblock simplethings_entityaudit_content %} +