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

[WebProfilerBundle] moved the token not found error to the new info page

Browse Source
This commit is contained in:
Fabien Potencier 2011-09-22 09:05:42 +02:00
parent e98584e2f3
commit c9ddd6fd8b
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
View File

@ -38,7 +38,7 @@ class ProfilerController extends ContainerAware
$panel = $this->container->get('request')->query->get('panel', 'request');
if (!$profile = $profiler->loadProfile($token)) {
return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.html.twig', array('token' => $token));
return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:info.html.twig', array('about' => 'no_token', 'token' => $token));
}
if (!$profile->hasCollector($panel)) {

5
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/info.html.twig
View File

@ -24,6 +24,11 @@
<p>
<em>The token already exists in the database.</em>
</p>
{% elseif about == 'no_token' %}
<h2>Token not found</h2>
<p>
<em>Token "{{ token }}" was not found in the database.</em>
</p>
{% endif %}
{% endblock %}
</div>

33
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig
View File

@ -1,33 +0,0 @@
{% extends 'WebProfilerBundle:Profiler:base.html.twig' %}
{% block body %}
<div id="content">
{% include 'WebProfilerBundle:Profiler:header.html.twig' only %}
<div id="resume">
<p>
<strong>No request matching the token "{{ token }}".</strong>
</p>
</div>
<div id="main">
<div class="clear_fix">
<div id="collector_wrapper">
<div id="collector_content">
{% block panel %}
<h2>Token not found</h2>
<p>
<em>No request matching the token "{{ token }}".</em>
</p>
{% endblock %}
</div>
</div>
<div id="navigation">
{% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %}
{% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
</div>
</div>
</div>
</div>
{% endblock %}