diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php index 729f2b243..005fa4a01 100644 --- a/src/Bundle/ChillMainBundle/Controller/CenterController.php +++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php @@ -36,7 +36,7 @@ class CenterController extends AbstractController $em->persist($center); $em->flush(); - return $this->redirect($this->generateUrl('admin_center_show', ['id' => $center->getId()])); + return $this->redirect($this->generateUrl('admin_center')); } return $this->render('@ChillMain/Center/new.html.twig', [ diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php index 74ebc73a7..5dc85d201 100644 --- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php +++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php @@ -36,7 +36,7 @@ class ScopeController extends AbstractController $em->persist($scope); $em->flush(); - return $this->redirect($this->generateUrl('admin_scope_show', ['id' => $scope->getId()])); + return $this->redirect($this->generateUrl('admin_scope')); } return $this->render('@ChillMain/Scope/new.html.twig', [ diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php index 0c974b637..a62ca88f3 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -319,9 +319,11 @@ class ChillMainExtension extends Extension implements ], 'new' => [ 'role' => 'ROLE_ADMIN', + 'template' => '@ChillMain/UserJob/new.html.twig', ], 'edit' => [ 'role' => 'ROLE_ADMIN', + 'template' => '@ChillMain/UserJob/edit.html.twig', ], ], ], diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig index d2018e2d3..30bea2d6e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig @@ -1,4 +1,4 @@ -{% extends '@ChillMain/Admin/layout_permissions.html.twig' %} +{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} {% block title %}{{ 'Center edit'|trans }}{% endblock %} @@ -10,11 +10,11 @@ {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }} {{ form_end(edit_form) }} - + {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig index 5ebd271b5..d6d4bb4cd 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig @@ -1,4 +1,4 @@ -{% extends '@ChillMain/Admin/layout_permissions.html.twig' %} +{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} {% block title %}{{ 'Center list'|trans }}{% endblock %} @@ -15,27 +15,25 @@ {% for entity in entities %} - {{ entity.name }} + {{ entity.name }} - + {% endfor %} -