From bd3b3df713b8b75b08f304bc90729d2c953eb574 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 7 Jun 2019 02:17:30 +0000 Subject: [PATCH] Convert the controllers for battery, APIUser, battery manufacturer, and battery model to use the Menu annotation. #222 --- src/Controller/APIUserController.php | 25 ++++++++++----- src/Controller/BatteryController.php | 32 +++++++++---------- .../BatteryManufacturerController.php | 32 +++++++++---------- src/Controller/BatteryModelController.php | 28 +++++++++------- src/Controller/HubController.php | 6 ++-- 5 files changed, 67 insertions(+), 56 deletions(-) diff --git a/src/Controller/APIUserController.php b/src/Controller/APIUserController.php index 250880c6..91abe141 100644 --- a/src/Controller/APIUserController.php +++ b/src/Controller/APIUserController.php @@ -12,16 +12,20 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; -class APIUserController extends BaseController +use Catalyst\MenuBundle\Annotation\Menu; + +class APIUserController extends Controller { + /** + * @Menu(selected="api_user_list") + */ public function index() { $this->denyAccessUnlessGranted('apiuser.list', null, 'No access.'); - $params = $this->initParameters('api_user_list'); - - return $this->render('api-user/list.html.twig', $params); + return $this->render('api-user/list.html.twig'); } public function rows(Request $req) @@ -120,11 +124,13 @@ class APIUserController extends BaseController ]); } + /** + * @Menu(selected="api_user_list") + */ public function addForm() { $this->denyAccessUnlessGranted('apiuser.add', null, 'No access.'); - $params = $this->initParameters('api_user_list'); $params['obj'] = new APIUser(); $params['mode'] = 'create'; @@ -198,11 +204,13 @@ class APIUserController extends BaseController } } + /** + * @Menu(selected="api_user_list") + */ public function updateForm($id) { $this->denyAccessUnlessGranted('apiuser.update', null, 'No access.'); - $params = $this->initParameters('api_ser_list'); $params['mode'] = 'update'; // get row data @@ -281,12 +289,13 @@ class APIUserController extends BaseController } } + /** + * @Menu(selected="api_user_list") + */ public function destroy($id) { $this->denyAccessUnlessGranted('apiuser.delete', null, 'No access.'); - $params = $this->initParameters('api_user_list'); - // get row data $em = $this->getDoctrine()->getManager(); $obj = $em->getRepository(APIUser::class)->find($id); diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php index c242a9b6..e2837623 100644 --- a/src/Controller/BatteryController.php +++ b/src/Controller/BatteryController.php @@ -2,7 +2,6 @@ namespace App\Controller; -use App\Ramcar\BaseController; use App\Entity\Battery; use App\Entity\BatteryManufacturer; use App\Entity\BatteryModel; @@ -15,24 +14,20 @@ use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use App\Menu\Generator as MenuGenerator; +use Catalyst\MenuBundle\Annotation\Menu; -class BatteryController extends BaseController +class BatteryController extends Controller { - public function __construct(MenuGenerator $menu_gen) - { - parent::__construct($menu_gen); - } - + /** + * @Menu(selected="battery_list") + */ public function index() { $this->denyAccessUnlessGranted('battery.list', null, 'No access.'); - $params = $this->initParameters('battery_list'); - - // response - return $this->render('battery/list.html.twig', $params); + return $this->render('battery/list.html.twig'); } public function rows(Request $req) @@ -145,11 +140,13 @@ class BatteryController extends BaseController ]); } + /** + * @Menu(selected="battery_list") + */ public function addForm() { $this->denyAccessUnlessGranted('battery.add', null, 'No access.'); - $params = $this->initParameters('battery_list'); $params['obj'] = new Battery(); $params['mode'] = 'create'; @@ -257,11 +254,13 @@ class BatteryController extends BaseController } } + /** + * @Menu(selected="battery_list") + */ public function updateForm($id) { $this->denyAccessUnlessGranted('battery.update', null, 'No access.'); - $params = $this->initParameters('battery_list'); $params['mode'] = 'update'; // get row data @@ -380,12 +379,13 @@ class BatteryController extends BaseController } } + /** + * @Menu(selected="battery_list") + */ public function destroy($id) { $this->denyAccessUnlessGranted('battery.delete', null, 'No access.'); - $params = $this->initParameters('battery_list'); - // get row data $em = $this->getDoctrine()->getManager(); $row = $em->getRepository(Battery::class)->find($id); diff --git a/src/Controller/BatteryManufacturerController.php b/src/Controller/BatteryManufacturerController.php index f0461f44..3090ccf9 100644 --- a/src/Controller/BatteryManufacturerController.php +++ b/src/Controller/BatteryManufacturerController.php @@ -2,7 +2,6 @@ namespace App\Controller; -use App\Ramcar\BaseController; use App\Entity\BatteryManufacturer; use App\Entity\Vehicle; use App\Entity\Battery; @@ -11,24 +10,20 @@ use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use App\Menu\Generator as MenuGenerator; +use Catalyst\MenuBundle\Annotation\Menu; -class BatteryManufacturerController extends BaseController +class BatteryManufacturerController extends Controller { - public function __construct(MenuGenerator $menu_gen) - { - parent::__construct($menu_gen); - } - + /** + * @Menu(selected="bmfg_list") + */ public function index() { $this->denyAccessUnlessGranted('bmfg.list', null, 'No access.'); - $params = $this->initParameters('bmfg_list'); - - // response - return $this->render('battery-manufacturer/list.html.twig', $params); + return $this->render('battery-manufacturer/list.html.twig'); } public function rows(Request $req) @@ -123,11 +118,13 @@ class BatteryManufacturerController extends BaseController ]); } + /** + * @Menu(selected="bmfg_list") + */ public function addForm() { $this->denyAccessUnlessGranted('bmfg.add', null, 'No access.'); - $params = $this->initParameters('bmfg_list'); $params['obj'] = new BatteryManufacturer(); $params['mode'] = 'create'; @@ -176,11 +173,13 @@ class BatteryManufacturerController extends BaseController } } + /** + * @Menu(selected="bmfg_list") + */ public function updateForm($id) { $this->denyAccessUnlessGranted('bmfg.update', null, 'No access.'); - $params = $this->initParameters('bmfg_list'); $params['mode'] = 'update'; // get row data @@ -241,12 +240,13 @@ class BatteryManufacturerController extends BaseController } } + /** + * @Menu(selected="bmfg_list") + */ public function destroy($id) { $this->denyAccessUnlessGranted('bmfg.delete', null, 'No access.'); - $params = $this->initParameters('bmfg_list'); - // get row data $em = $this->getDoctrine()->getManager(); $row = $em->getRepository(BatteryManufacturer::class)->find($id); diff --git a/src/Controller/BatteryModelController.php b/src/Controller/BatteryModelController.php index 81eaa40a..dcf1a46e 100644 --- a/src/Controller/BatteryModelController.php +++ b/src/Controller/BatteryModelController.php @@ -9,24 +9,23 @@ use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; + +use Catalyst\MenuBundle\Annotation\Menu; use App\Menu\Generator as MenuGenerator; class BatteryModelController extends BaseController { - public function __construct(MenuGenerator $menu_gen) - { - parent::__construct($menu_gen); - } - + /** + * @Menu(selected="bmodel_list") + */ public function index() { $this->denyAccessUnlessGranted('bmodel.list', null, 'No access.'); - $params = $this->initParameters('bmodel_list'); - // response - return $this->render('battery-model/list.html.twig', $params); + return $this->render('battery-model/list.html.twig'); } public function rows(Request $req) @@ -115,11 +114,13 @@ class BatteryModelController extends BaseController ]); } + /** + * @Menu(selected="bmodel_list") + */ public function addForm() { $this->denyAccessUnlessGranted('bmodel.add', null, 'No access.'); - $params = $this->initParameters('bmodel_list'); $params['obj'] = new BatteryModel(); $params['mode'] = 'create'; @@ -168,11 +169,13 @@ class BatteryModelController extends BaseController } } + /** + * @Menu(selected="bmodel_list") + */ public function updateForm($id) { $this->denyAccessUnlessGranted('bmodel.update', null, 'No access.'); - $params = $this->initParameters('bmodel_list'); $params['mode'] = 'update'; // get row data @@ -233,12 +236,13 @@ class BatteryModelController extends BaseController } } + /** + * @Menu(selected="bmodel_list") + */ public function destroy($id) { $this->denyAccessUnlessGranted('bmodel.delete', null, 'No access.'); - $params = $this->initParameters('bmodel_list'); - // get row data $em = $this->getDoctrine()->getManager(); $row = $em->getRepository(BatteryModel::class)->find($id); diff --git a/src/Controller/HubController.php b/src/Controller/HubController.php index 8e4feac5..eb1faa73 100644 --- a/src/Controller/HubController.php +++ b/src/Controller/HubController.php @@ -2,7 +2,6 @@ namespace App\Controller; -use App\Ramcar\BaseController; use App\Entity\Hub; use Doctrine\ORM\Query; @@ -18,8 +17,7 @@ use DateTime; use Catalyst\MenuBundle\Annotation\Menu; - -class HubController extends BaseController +class HubController extends Controller { /** * @Menu(selected="hub_list") @@ -273,7 +271,7 @@ class HubController extends BaseController { $this->denyAccessUnlessGranted('hub.delete', null, 'No access.'); - // get objext data + // get object data $em = $this->getDoctrine()->getManager(); $obj = $em->getRepository(Hub::class)->find($id);