bug #25526 [WebProfilerBundle] Fix panel break when stopwatch component is not installed. (umulmrum, javiereguiluz)
This PR was merged into the 3.4 branch. Discussion ---------- [WebProfilerBundle] Fix panel break when stopwatch component is not installed. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25350 | License | MIT | Doc PR | - Fixes a crash in the time profiler panel when the stopwatch is not installed. This avoids a hard dependency like the ticket author requested, as the rest of the component can already deal with that case. I think this is an issue in 3.4+, but I only tested against 4.0.2 locally (code in the affected file only differs in whitespace between 3.4 and 4.0). Commits -------e9577cb207
Display n/a for sub-requests time when Stopwatch component is not installed410b597393
Fix panel break when stopwatch component is not installed.
This commit is contained in:
commit
ae6f66821f
@ -14,10 +14,12 @@
|
|||||||
} %}
|
} %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% set has_time_events = collector.events|length > 0 %}
|
||||||
|
|
||||||
{% block toolbar %}
|
{% block toolbar %}
|
||||||
{% set total_time = collector.events|length ? '%.0f'|format(collector.duration) : 'n/a' %}
|
{% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
|
||||||
{% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
|
{% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
|
||||||
{% set status_color = collector.events|length and collector.duration > 1000 ? 'yellow' : '' %}
|
{% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' : '' %}
|
||||||
|
|
||||||
{% set icon %}
|
{% set icon %}
|
||||||
{{ include('@WebProfiler/Icon/time.svg') }}
|
{{ include('@WebProfiler/Icon/time.svg') }}
|
||||||
@ -75,10 +77,14 @@
|
|||||||
<span class="label">Sub-Request{{ profile.children|length > 1 ? 's' }}</span>
|
<span class="label">Sub-Request{{ profile.children|length > 1 ? 's' }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% set subrequests_time = 0 %}
|
{% if has_time_events %}
|
||||||
{% for child in profile.children %}
|
{% set subrequests_time = 0 %}
|
||||||
{% set subrequests_time = subrequests_time + child.getcollector('time').events.__section__.duration %}
|
{% for child in profile.children %}
|
||||||
{% endfor %}
|
{% set subrequests_time = subrequests_time + child.getcollector('time').events.__section__.duration %}
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
{% set subrequests_time = 'n/a' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="metric">
|
<div class="metric">
|
||||||
<span class="value">{{ subrequests_time }} <span class="unit">ms</span></span>
|
<span class="value">{{ subrequests_time }} <span class="unit">ms</span></span>
|
||||||
|
Reference in New Issue
Block a user