forked from propelorm/PropelBundle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(MOS-1414): Extended PanelController from AbstractController.
- Loading branch information
1 parent
76a5c36
commit 15f80e3
Showing
1 changed file
with
8 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
|
||
namespace Propel\Bundle\PropelBundle\Controller; | ||
|
||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; | ||
use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
use Symfony\Component\DependencyInjection\ContainerAwareTrait; | ||
use Symfony\Component\HttpFoundation\Response; | ||
|
@@ -19,7 +20,7 @@ | |
* | ||
* @author William DURAND <[email protected]> | ||
*/ | ||
class PanelController implements ContainerAwareInterface | ||
class PanelController extends AbstractController implements ContainerAwareInterface | ||
{ | ||
use ContainerAwareTrait; | ||
|
||
|
@@ -29,15 +30,15 @@ class PanelController implements ContainerAwareInterface | |
public function configurationAction() | ||
{ | ||
return new Response( | ||
$this->container->get('twig')->render( | ||
$this->render( | ||
'@Propel/Panel/configuration.html.twig', | ||
[ | ||
'propel_version' => \Propel::VERSION, | ||
'configuration' => $this->container->get('propel.configuration')->getParameters(), | ||
'default_connection' => $this->container->getParameter('propel.dbal.default_connection'), | ||
'logging' => $this->container->getParameter('propel.logging'), | ||
'path' => $this->container->getParameter('propel.path'), | ||
'phing_path' => $this->container->getParameter('propel.phing_path'), | ||
'default_connection' => $this->getParameter('propel.dbal.default_connection'), | ||
'logging' => $this->getParameter('propel.logging'), | ||
'path' => $this->getParameter('propel.path'), | ||
'phing_path' => $this->getParameter('propel.phing_path'), | ||
] | ||
) | ||
); | ||
|
@@ -78,7 +79,7 @@ public function explainAction($token, $connection, $query) | |
} | ||
|
||
return new Response( | ||
$this->container->get('twig')->render( | ||
$this->render( | ||
'@Propel/Panel/explain.html.twig', | ||
[ | ||
'data' => $results, | ||
|