rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Add menu annotations to controllers for ticket, user, vehicle, and vehicle manufacturer. Remove BaseController from APIUserController. #222

Browse source
This commit is contained in:
Korina Cordero 2019-06-07 09:49:28 +00:00
parent 5a0bf45983
commit 4ccdb8c5aa
5 changed files with 58 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/APIUserController.php
View file

@ -2,8 +2,6 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use Catalyst\APIBundle\Entity\User as APIUser;
use Catalyst\APIBundle\Entity\Role as APIRole;

23
src/Controller/TicketController.php
View file

@ -2,7 +2,6 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use App\Ramcar\TicketType;
use App\Ramcar\TicketStatus;
use App\Entity\Ticket;
@ -14,18 +13,22 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Catalyst\MenuBundle\Annotation\Menu;
use DateTime;
class TicketController extends BaseController
class TicketController extends Controller
{
/**
* @Menu(selected="ticket_list")
*/
public function index()
{
$this->denyAccessUnlessGranted('ticket.list', null, 'No access.');
$params = $this->initParameters('ticket_list');
return $this->render('ticket/list.html.twig', $params);
return $this->render('ticket/list.html.twig');
}
public function rows(Request $req)
@ -120,11 +123,13 @@ class TicketController extends BaseController
]);
}
/**
* @Menu(selected="ticket_list")
*/
public function addForm(Request $req, $customer_id, $job_order_id)
{
$this->denyAccessUnlessGranted('ticket.add', null, 'No access.');
$params = $this->initParameters('ticket_list');
$params['obj'] = new Ticket();
$params['mode'] = 'create';
$params['customer'] = false;
@ -292,11 +297,13 @@ class TicketController extends BaseController
}
}
/**
* @Menu(selected="ticket_list")
*/
public function updateForm(Request $req, $id)
{
$this->denyAccessUnlessGranted('ticket.update', null, 'No access.');
$params = $this->initParameters('ticket_list');
$params['mode'] = 'update';
// get row data
@ -440,8 +447,6 @@ class TicketController extends BaseController
{
$this->denyAccessUnlessGranted('ticket.delete', null, 'No access.');
$params = $this->initParameters('ticket_list');
// get row data
$em = $this->getDoctrine()->getManager();
$obj = $em->getRepository(Ticket::class)->find($id);

27
src/Controller/UserController.php
View file

@ -2,7 +2,6 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use App\Entity\User;
use App\Entity\Role;
use App\Entity\Hub;
@ -12,16 +11,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 UserController extends BaseController
use Catalyst\MenuBundle\Annotation\Menu;
class UserController extends Controller
{
/**
* @Menu(selected="user_list")
*/
public function index()
{
$this->denyAccessUnlessGranted('user.list', null, 'No access.');
$params = $this->initParameters('user_list');
return $this->render('user/list.html.twig', $params);
return $this->render('user/list.html.twig');
}
public function rows(Request $req)
@ -123,11 +126,13 @@ class UserController extends BaseController
]);
}
/**
* @Menu(selected="user_list")
*/
public function addForm()
{
$this->denyAccessUnlessGranted('user.add', null, 'No access.');
$params = $this->initParameters('user_list');
$params['obj'] = new User();
$params['mode'] = 'create';
@ -237,11 +242,13 @@ class UserController extends BaseController
}
}
/**
* @Menu(selected="user_list")
*/
public function updateForm($id)
{
$this->denyAccessUnlessGranted('user.update', null, 'No access.');
$params = $this->initParameters('user_list');
$params['mode'] = 'update';
// get row data
@ -361,8 +368,6 @@ class UserController extends BaseController
{
$this->denyAccessUnlessGranted('user.delete', null, 'No access.');
$params = $this->initParameters('user_list');
// get row data
$em = $this->getDoctrine()->getManager();
$obj = $em->getRepository(User::class)->find($id);
@ -392,11 +397,13 @@ class UserController extends BaseController
}
}
/**
* @Menu(selected="user_profile")
*/
public function profileForm()
{
$this->denyAccessUnlessGranted('user.profile', null, 'No access.');
$params = $this->initParameters('user_profile');
$params['mode'] = 'profile';
// get row data

23
src/Controller/VehicleController.php
View file

@ -2,7 +2,6 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use App\Entity\Vehicle;
use App\Entity\VehicleManufacturer;
use App\Entity\Battery;
@ -11,17 +10,21 @@ 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;
class VehicleController extends BaseController
use Catalyst\MenuBundle\Annotation\Menu;
class VehicleController extends Controller
{
/**
* @Menu(selected="vehicle_list")
*/
public function index()
{
$this->denyAccessUnlessGranted('vehicle.list', null, 'No access.');
$params = $this->initParameters('vehicle_list');
// response
return $this->render('vehicle/list.html.twig', $params);
return $this->render('vehicle/list.html.twig');
}
public function rows(Request $req)
@ -121,11 +124,13 @@ class VehicleController extends BaseController
]);
}
/**
* @Menu(selected="vehicle_list")
*/
public function addForm()
{
$this->denyAccessUnlessGranted('vehicle.add', null, 'No access.');
$params = $this->initParameters('vehicle_list');
$params['obj'] = new Vehicle();
$params['mode'] = 'create';
@ -197,11 +202,13 @@ class VehicleController extends BaseController
}
}
/**
* @Menu(selected="vehicle_list")
*/
public function updateForm($id)
{
$this->denyAccessUnlessGranted('vehicle.update', null, 'No access.');
$params = $this->initParameters('vehicle_list');
$params['mode'] = 'update';
// get row data
@ -287,8 +294,6 @@ class VehicleController extends BaseController
{
$this->denyAccessUnlessGranted('vehicle.delete', null, 'No access.');
$params = $this->initParameters('vehicle_list');
// get row data
$em = $this->getDoctrine()->getManager();
$row = $em->getRepository(Vehicle::class)->find($id);

28
src/Controller/VehicleManufacturerController.php
View file

@ -2,31 +2,27 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use App\Entity\VehicleManufacturer;
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 VehicleManufacturerController extends BaseController
class VehicleManufacturerController extends Controller
{
public function __construct(MenuGenerator $menu_gen)
{
parent::__construct($menu_gen);
}
/**
* @Menu(selected="vmfg_list")
*/
public function index()
{
$this->denyAccessUnlessGranted('vmfg.list', null, 'No access.');
$params = $this->initParameters('vmfg_list');
// response
return $this->render('vehicle-manufacturer/list.html.twig', $params);
return $this->render('vehicle-manufacturer/list.html.twig');
}
public function rows(Request $req)
@ -115,11 +111,13 @@ class VehicleManufacturerController extends BaseController
]);
}
/**
* @Menu(selected="vmfg_list")
*/
public function addForm()
{
$this->denyAccessUnlessGranted('vmfg.add', null, 'No access.');
$params = $this->initParameters('vmfg_list');
$params['obj'] = new VehicleManufacturer();
$params['mode'] = 'create';
@ -173,11 +171,13 @@ class VehicleManufacturerController extends BaseController
}
}
/**
* @Menu(selected="vmfg_list")
*/
public function updateForm($id)
{
$this->denyAccessUnlessGranted('vmfg.update', null, 'No access.');
$params = $this->initParameters('vmfg_list');
$params['mode'] = 'update';
// get row data
@ -248,8 +248,6 @@ class VehicleManufacturerController extends BaseController
{
$this->denyAccessUnlessGranted('vmfg.delete', null, 'No access.');
$params = $this->initParameters('vmfg_list');
// get row data
$em = $this->getDoctrine()->getManager();
$row = $em->getRepository(VehicleManufacturer::class)->find($id);