diff --git a/app/config/security.yml b/app/config/security.yml index 5a188796..900713db 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -46,7 +46,7 @@ security: ROLE_USER: ROLE_CUSTOMER ROLE_TEAMLEAD: ROLE_USER ROLE_ADMIN: ROLE_TEAMLEAD - ROLE_SUPER_ADMIN: [ROLE_ADMIN] + ROLE_SUPER_ADMIN: ROLE_ADMIN access_control: # this is a catch-all for the admin area diff --git a/src/AppBundle/Controller/Admin/UserController.php b/src/AppBundle/Controller/Admin/UserController.php index 730c7a98..5a6b9f01 100644 --- a/src/AppBundle/Controller/Admin/UserController.php +++ b/src/AppBundle/Controller/Admin/UserController.php @@ -23,7 +23,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; * Controller used to manage users in the admin part of the site. * * @Route("/admin/user") - * @Security("has_role('ROLE_ADMIN')") + * @Security("has_role('ROLE_SUPER_ADMIN')") * * @author Kevin Papst */ diff --git a/src/AppBundle/DataFixtures/ORM/LoadFixtures.php b/src/AppBundle/DataFixtures/ORM/LoadFixtures.php index acd916f2..5eb79e50 100644 --- a/src/AppBundle/DataFixtures/ORM/LoadFixtures.php +++ b/src/AppBundle/DataFixtures/ORM/LoadFixtures.php @@ -33,7 +33,6 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface public function load(ObjectManager $manager) { $this->loadUsers($manager); - //$this->loadPosts($manager); } private function loadUsers(ObjectManager $manager) @@ -80,6 +79,16 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $annaAdmin->setPassword($encodedPassword); $manager->persist($annaAdmin); + $susanSuper = new User(); + $susanSuper->setAlias('Susan Sanchez'); + $susanSuper->setTitle('Super Administrator'); + $susanSuper->setUsername('susan_super'); + $susanSuper->setEmail('susan_super@example.com'); + $susanSuper->setRoles(['ROLE_SUPER_ADMIN']); + $encodedPassword = $passwordEncoder->encodePassword($susanSuper, 'kitten'); + $susanSuper->setPassword($encodedPassword); + $manager->persist($susanSuper); + $manager->flush(); } @@ -91,46 +100,6 @@ class LoadFixtures implements FixtureInterface, ContainerAwareInterface $this->container = $container; } - protected function getPostContent() - { - return <<getPhrases(); - - $numPhrases = mt_rand(6, 12); - shuffle($phrases); - - return substr(implode(' ', array_slice($phrases, 0, $numPhrases-1)), 0, $maxLength); - } - - private function getRandomCommentContent() - { - $phrases = $this->getPhrases(); - - $numPhrases = mt_rand(2, 15); - shuffle($phrases); - - return implode(' ', array_slice($phrases, 0, $numPhrases-1)); - } } diff --git a/src/AppBundle/EventListener/MenuBuilder.php b/src/AppBundle/EventListener/MenuBuilder.php index 2c7dd37b..a794569f 100644 --- a/src/AppBundle/EventListener/MenuBuilder.php +++ b/src/AppBundle/EventListener/MenuBuilder.php @@ -59,10 +59,10 @@ class MenuBuilder $request = $event->getRequest(); $isLoggedIn = $this->security->isGranted('IS_AUTHENTICATED_FULLY'); $isTeamlead = $isLoggedIn && $this->security->isGranted('ROLE_TEAMLEAD'); - $isAdmin = $isLoggedIn && $this->security->isGranted('ROLE_ADMIN'); + $isSuperAdmin = $isLoggedIn && $this->security->isGranted('ROLE_SUPER_ADMIN'); $event->addItem( - new MenuItemModel('dashboard', 'menu.homepage', 'dashboard', [], 'fa fa-dashboard') // fa-home + new MenuItemModel('dashboard', 'menu.homepage', 'dashboard', [], 'fa fa-dashboard') ); $this->eventDispatcher->dispatch( @@ -78,7 +78,7 @@ class MenuBuilder $admin = new MenuItemModel('admin', 'menu.admin', '', [], 'fa fa-wrench'); $event->addItem($admin); - if ($isAdmin) { + if ($isSuperAdmin) { $admin->addChild( new MenuItemModel('user_admin', 'menu.admin_user', 'admin_user', [], 'fa fa-user') );