diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[WebProfilerBundle] fixed macro usage (to be forward compatible with Twig 2.x)

Browse Source
This commit is contained in:
Fabien Potencier 2012-10-15 09:28:03 +02:00
parent dc519847fe
commit 8731cc30ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
View File

@ -1,5 +1,7 @@
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
{% from _self import display_timeline, dump_events, dump_request_data %}
{% if colors is not defined %} {% if colors is not defined %}
{% set colors = { {% set colors = {
'default': '#aacd4e', 'default': '#aacd4e',
@ -77,7 +79,7 @@
{% set max = collector.events.__section__.endtime %} {% set max = collector.events.__section__.endtime %}
{{ _self.display_timeline('timeline_' ~ token, collector.events, colors) }} {{ display_timeline('timeline_' ~ token, collector.events, colors) }}
{% if profile.children|length %} {% if profile.children|length %}
{% for child in profile.children %} {% for child in profile.children %}
@ -87,7 +89,7 @@
<small> - {{ events.__section__.totaltime }} ms</small> <small> - {{ events.__section__.totaltime }} ms</small>
</h3> </h3>
{{ _self.display_timeline('timeline_' ~ child.token, events, colors) }} {{ display_timeline('timeline_' ~ child.token, events, colors) }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -388,12 +390,12 @@
var requests_data = { var requests_data = {
"max": {{ "%F"|format(collector.events.__section__.endtime) }}, "max": {{ "%F"|format(collector.events.__section__.endtime) }},
"requests": [ "requests": [
{{ _self.dump_request_data(token, profile, collector.events, collector.events.__section__.origin) }} {{ dump_request_data(token, profile, collector.events, collector.events.__section__.origin) }}
{% if profile.children|length %} {% if profile.children|length %}
, ,
{% for child in profile.children %} {% for child in profile.children %}
{{ _self.dump_request_data(child.token, child, child.getcollector('time').events, collector.events.__section__.origin) }}{{ loop.last ? '' : ',' }} {{ dump_request_data(child.token, child, child.getcollector('time').events, collector.events.__section__.origin) }}{{ loop.last ? '' : ',' }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
] ]
@ -431,7 +433,7 @@
"id": "{{ token }}", "id": "{{ token }}",
"left": {{ "%F"|format(events.__section__.origin - origin) }}, "left": {{ "%F"|format(events.__section__.origin - origin) }},
"events": [ "events": [
{{ _self.dump_events(events) }} {{ dump_events(events) }}
] ]
} }
{% endmacro %} {% endmacro %}