diff --git a/Controller/PermissionsGroupController.php b/Controller/PermissionsGroupController.php index 64f2edb27..6c1d0e5d3 100644 --- a/Controller/PermissionsGroupController.php +++ b/Controller/PermissionsGroupController.php @@ -483,8 +483,8 @@ class PermissionsGroupController extends Controller $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup); // sort role scope by title - /* @var $roleProvider \Chill\MainBundle\Security\RoleProvider */ - $roleProvider = $this->get('chill.main.role_provider'); + + $roleProvider = $this->roleProvider; $roleScopesSorted = array(); foreach($permissionsGroup->getRoleScopes()->toArray() as $roleScope) { /* @var $roleScope RoleScope */ diff --git a/config/routes.yaml b/config/routes.yaml index b363ee3e9..5bbd0729b 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -32,11 +32,11 @@ chill_password_recover: root: - path: / - defaults: - controller: Framework\RedirectController::urlRedirect - path: /homepage - permanent: false + path: / + controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction + defaults: + path: /homepage + permanent: false chill_main_homepage_without_locale: path: /homepage @@ -62,7 +62,7 @@ chill_main_admin_permissions: chill_main_search: path: /{_locale}/search.{_format} controller: Chill\MainBundle\Controller\SearchController::searchAction - format: 'html' + format: 'html' # sf4 check requirements: _format: html|json