From 8860e6a4833817377db8eac49f5c3a4ba155f97b Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Sun, 14 Jan 2018 21:13:42 +0800 Subject: [PATCH] Optimize how object vars are passed to crud forms --- src/Controller/BatteryController.php | 5 +- .../BatteryManufacturerController.php | 6 ++- src/Controller/BatteryModelController.php | 6 ++- src/Controller/BatterySizeController.php | 6 ++- src/Controller/CustomerController.php | 5 +- src/Controller/RoleController.php | 6 ++- src/Controller/UserController.php | 5 +- src/Controller/VehicleController.php | 5 +- .../VehicleManufacturerController.php | 5 +- templates/battery-manufacturer/form.html.twig | 12 ++--- templates/battery-model/form.html.twig | 8 +-- templates/battery-size/form.html.twig | 8 +-- templates/battery/form.html.twig | 54 +++++++++---------- templates/customer/form.html.twig | 10 ++-- templates/role/form.html.twig | 12 ++--- templates/user/form.html.twig | 20 +++---- templates/vehicle-manufacturer/form.html.twig | 8 +-- templates/vehicle/form.html.twig | 18 +++---- 18 files changed, 110 insertions(+), 89 deletions(-) diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php index f2923705..9991d5d5 100644 --- a/src/Controller/BatteryController.php +++ b/src/Controller/BatteryController.php @@ -151,6 +151,8 @@ class BatteryController extends BaseController $this->denyAccessUnlessGranted('battery.add', null, 'No access.'); $params = $this->initParameters('battery_list'); + $params['obj'] = new Battery(); + $params['mode'] = 'create'; $em = $this->getDoctrine()->getManager(); @@ -258,6 +260,7 @@ class BatteryController extends BaseController $this->denyAccessUnlessGranted('battery.update', null, 'No access.'); $params = $this->initParameters('battery_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -273,7 +276,7 @@ class BatteryController extends BaseController $params['sizes'] = $em->getRepository(BatterySize::class)->findAll(); $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); - $params['row'] = $row; + $params['obj'] = $row; // response return $this->render('battery/form.html.twig', $params); diff --git a/src/Controller/BatteryManufacturerController.php b/src/Controller/BatteryManufacturerController.php index 369156c4..1f791198 100644 --- a/src/Controller/BatteryManufacturerController.php +++ b/src/Controller/BatteryManufacturerController.php @@ -130,6 +130,8 @@ class BatteryManufacturerController extends BaseController $this->denyAccessUnlessGranted('bmfg.add', null, 'No access.'); $params = $this->initParameters('bmfg_list'); + $params['obj'] = new BatteryManufacturer(); + $params['mode'] = 'create'; // response return $this->render('battery-manufacturer/form.html.twig', $params); @@ -181,6 +183,7 @@ class BatteryManufacturerController extends BaseController $this->denyAccessUnlessGranted('bmfg.update', null, 'No access.'); $params = $this->initParameters('bmfg_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -190,8 +193,7 @@ class BatteryManufacturerController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; - $params['values'] = []; + $params['obj'] = $row; // response return $this->render('battery-manufacturer/form.html.twig', $params); diff --git a/src/Controller/BatteryModelController.php b/src/Controller/BatteryModelController.php index 9a26baa2..314617fc 100644 --- a/src/Controller/BatteryModelController.php +++ b/src/Controller/BatteryModelController.php @@ -124,6 +124,8 @@ class BatteryModelController extends BaseController $this->denyAccessUnlessGranted('bmodel.add', null, 'No access.'); $params = $this->initParameters('bmodel_list'); + $params['obj'] = new BatteryModel(); + $params['mode'] = 'create'; // response return $this->render('battery-model/form.html.twig', $params); @@ -175,6 +177,7 @@ class BatteryModelController extends BaseController $this->denyAccessUnlessGranted('bmodel.update', null, 'No access.'); $params = $this->initParameters('bmodel_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -184,8 +187,7 @@ class BatteryModelController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; - $params['values'] = []; + $params['obj'] = $row; // response return $this->render('battery-model/form.html.twig', $params); diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php index e75c0b83..2a546e80 100644 --- a/src/Controller/BatterySizeController.php +++ b/src/Controller/BatterySizeController.php @@ -124,6 +124,8 @@ class BatterySizeController extends BaseController $this->denyAccessUnlessGranted('bsize.add', null, 'No access.'); $params = $this->initParameters('bsize_list'); + $params['obj'] = new BatterySize(); + $params['mode'] = 'create'; // response return $this->render('battery-size/form.html.twig', $params); @@ -175,6 +177,7 @@ class BatterySizeController extends BaseController $this->denyAccessUnlessGranted('bsize.update', null, 'No access.'); $params = $this->initParameters('bsize_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -184,8 +187,7 @@ class BatterySizeController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; - $params['values'] = []; + $params['obj'] = $row; // response return $this->render('battery-size/form.html.twig', $params); diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index 300e9416..7a496ae0 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -128,6 +128,8 @@ class CustomerController extends BaseController $this->denyAccessUnlessGranted('customer.add', null, 'No access.'); $params = $this->initParameters('customer_list'); + $params['obj'] = new Customer(); + $params['mode'] = 'create'; $em = $this->getDoctrine()->getManager(); @@ -184,6 +186,7 @@ class CustomerController extends BaseController $this->denyAccessUnlessGranted('customer.update', null, 'No access.'); $params = $this->initParameters('customer_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -193,7 +196,7 @@ class CustomerController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; + $params['obj'] = $row; $params['values'] = []; // response diff --git a/src/Controller/RoleController.php b/src/Controller/RoleController.php index 922b354c..b8a14184 100644 --- a/src/Controller/RoleController.php +++ b/src/Controller/RoleController.php @@ -139,7 +139,8 @@ class RoleController extends BaseController $params = $this->initParameters('role_list'); $this->padACLHierarchy($params); - + $params['obj'] = new Role(); + $params['mode'] = 'create'; // response return $this->render('role/form.html.twig', $params); @@ -204,6 +205,7 @@ class RoleController extends BaseController $params = $this->initParameters('role_list'); $this->padACLHierarchy($params); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -213,7 +215,7 @@ class RoleController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; + $params['obj'] = $row; $params['values'] = []; // response diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 3f5e02c3..c6cfaf2a 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -128,6 +128,8 @@ class UserController extends BaseController $this->denyAccessUnlessGranted('user.add', null, 'No access.'); $params = $this->initParameters('user_list'); + $params['obj'] = new User(); + $params['mode'] = 'create'; // get roles $em = $this->getDoctrine()->getManager(); @@ -225,6 +227,7 @@ class UserController extends BaseController $this->denyAccessUnlessGranted('user.update', null, 'No access.'); $params = $this->initParameters('user_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -238,7 +241,7 @@ class UserController extends BaseController $em = $this->getDoctrine()->getManager(); $params['roles'] = $em->getRepository(Role::class)->findAll(); - $params['row'] = $row; + $params['obj'] = $row; $params['values'] = []; // response diff --git a/src/Controller/VehicleController.php b/src/Controller/VehicleController.php index f6db4419..d2568fd0 100644 --- a/src/Controller/VehicleController.php +++ b/src/Controller/VehicleController.php @@ -124,6 +124,8 @@ class VehicleController extends BaseController $this->denyAccessUnlessGranted('vehicle.add', null, 'No access.'); $params = $this->initParameters('vehicle_list'); + $params['obj'] = new Vehicle(); + $params['mode'] = 'create'; $em = $this->getDoctrine()->getManager(); @@ -193,6 +195,7 @@ class VehicleController extends BaseController $this->denyAccessUnlessGranted('vehicle.update', null, 'No access.'); $params = $this->initParameters('vehicle_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -206,7 +209,7 @@ class VehicleController extends BaseController $params['manufacturers'] = $em->getRepository(VehicleManufacturer::class)->findAll(); $params['years'] = $this->generateYearOptions(); - $params['row'] = $row; + $params['obj'] = $row; // response return $this->render('vehicle/form.html.twig', $params); diff --git a/src/Controller/VehicleManufacturerController.php b/src/Controller/VehicleManufacturerController.php index 09374a79..641c0892 100644 --- a/src/Controller/VehicleManufacturerController.php +++ b/src/Controller/VehicleManufacturerController.php @@ -124,6 +124,8 @@ class VehicleManufacturerController extends BaseController $this->denyAccessUnlessGranted('vmfg.add', null, 'No access.'); $params = $this->initParameters('vmfg_list'); + $params['obj'] = new VehicleManufacturer(); + $params['mode'] = 'create'; // response return $this->render('vehicle-manufacturer/form.html.twig', $params); @@ -175,6 +177,7 @@ class VehicleManufacturerController extends BaseController $this->denyAccessUnlessGranted('vmfg.update', null, 'No access.'); $params = $this->initParameters('vmfg_list'); + $params['mode'] = 'update'; // get row data $em = $this->getDoctrine()->getManager(); @@ -184,7 +187,7 @@ class VehicleManufacturerController extends BaseController if (empty($row)) throw $this->createNotFoundException('The item does not exist'); - $params['row'] = $row; + $params['obj'] = $row; $params['values'] = []; // response diff --git a/templates/battery-manufacturer/form.html.twig b/templates/battery-manufacturer/form.html.twig index 2b0f9505..81aa2bb9 100644 --- a/templates/battery-manufacturer/form.html.twig +++ b/templates/battery-manufacturer/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Manufacturer - {{ row.getName() }} + {{ obj.getName() }} {% else %} New Manufacturer {% endif %} @@ -32,18 +32,18 @@ -
-
+ +
- + Display name for this manufacturer
-
+
diff --git a/templates/battery-model/form.html.twig b/templates/battery-model/form.html.twig index fa19d61f..7079ca26 100644 --- a/templates/battery-model/form.html.twig +++ b/templates/battery-model/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Model - {{ row.getName() }} + {{ obj.getName() }} {% else %} New Model {% endif %} @@ -32,14 +32,14 @@

- +
- + Display name for this model
diff --git a/templates/battery-size/form.html.twig b/templates/battery-size/form.html.twig index fb2eab3e..5f7406e4 100644 --- a/templates/battery-size/form.html.twig +++ b/templates/battery-size/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Size - {{ row.getName() }} + {{ obj.getName() }} {% else %} New Size {% endif %} @@ -32,14 +32,14 @@

- +
- + Display name for this size
diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig index dafd0455..264d8067 100644 --- a/templates/battery/form.html.twig +++ b/templates/battery/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Battery - {{ row.getProductCode() }} + {{ obj.getProductCode() }} {% else %} New Battery {% endif %} @@ -32,7 +32,7 @@

- +
  • @@ -55,7 +55,7 @@ Product Code:
    - + Unique identifier for this product
    @@ -63,7 +63,7 @@ Selling Price:
    - +
@@ -75,7 +75,7 @@ @@ -87,7 +87,7 @@ @@ -99,7 +99,7 @@ @@ -118,7 +118,7 @@ Personal:
- + In months
@@ -126,7 +126,7 @@ Commercial:
- + In months
@@ -143,7 +143,7 @@ Length:
- + In millimeters (mm)
@@ -151,7 +151,7 @@ Width:
- + In millimeters (mm)
@@ -159,7 +159,7 @@ Height:
- + In millimeters (mm)
@@ -169,7 +169,7 @@ Total Height:
- + In millimeters (mm)
@@ -177,7 +177,7 @@ Reserve Capacity
- + In minutes
@@ -312,20 +312,18 @@ var vehicleRows = []; var vehicleIds = []; - {% if row is defined %} - {% for vehicle in row.getVehicles() %} - vrow = { - id: "{{ vehicle.getID() }}", - mfg_name: "{{ vehicle.getManufacturer().getName() }}", - make: "{{ vehicle.getMake() }}", - model_year_from: "{{ vehicle.getModelYearFrom() }}", - model_year_to: "{{ vehicle.getModelYearTo() }}" - }; + {% for vehicle in obj.getVehicles() %} + vrow = { + id: "{{ vehicle.getID() }}", + mfg_name: "{{ vehicle.getManufacturer().getName() }}", + make: "{{ vehicle.getMake() }}", + model_year_from: "{{ vehicle.getModelYearFrom() }}", + model_year_to: "{{ vehicle.getModelYearTo() }}" + }; - vehicleRows.push(vrow); - vehicleIds.push("{{ vehicle.getID() }}"); - {% endfor %} - {% endif %} + vehicleRows.push(vrow); + vehicleIds.push("{{ vehicle.getID() }}"); + {% endfor %} // update vehicle list when changing manufacturer $("#vmfg").change(function() { diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index b36ac66e..f458f678 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Customer - {{ row.getFirstName() ~ ' ' ~ row.getLastName() }} + {{ obj.getFirstName() ~ ' ' ~ obj.getLastName() }} {% else %} New Customer {% endif %} @@ -32,7 +32,7 @@ - +
  • @@ -52,14 +52,14 @@ First Name:
    - +
    - +
diff --git a/templates/role/form.html.twig b/templates/role/form.html.twig index af3c2c7c..01e4e7ac 100644 --- a/templates/role/form.html.twig +++ b/templates/role/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Role - {{ row.getID() }} + {{ obj.getID() }} {% else %} New Role {% endif %} @@ -32,14 +32,14 @@ - +
- + Unique identifier for this role
@@ -49,7 +49,7 @@ Name:
- + Display name for this role
@@ -64,7 +64,7 @@ {{ acl_layer.label }}
{% for key, label in acl_layer.acls %} diff --git a/templates/user/form.html.twig b/templates/user/form.html.twig index 759f4137..e505cf31 100644 --- a/templates/user/form.html.twig +++ b/templates/user/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit User - {{ row.getUsername() }} + {{ obj.getUsername() }} {% else %} New User {% endif %} @@ -32,7 +32,7 @@

- +
@@ -40,7 +40,7 @@ Username:
- + Unique alias for this user
@@ -69,14 +69,14 @@ First Name:
- +
- +
@@ -85,14 +85,14 @@ E-mail Address:
- +
- +
@@ -106,7 +106,7 @@ {% if role.isSuperAdmin and not is_granted('user.role.sadmin') %} {% else %} @@ -124,7 +124,7 @@
diff --git a/templates/vehicle-manufacturer/form.html.twig b/templates/vehicle-manufacturer/form.html.twig index 13e630a2..4f2dd831 100644 --- a/templates/vehicle-manufacturer/form.html.twig +++ b/templates/vehicle-manufacturer/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Manufacturer - {{ row.getName() }} + {{ obj.getName() }} {% else %} New Manufacturer {% endif %} @@ -32,14 +32,14 @@

- +
- + Display name for this manufacturer
diff --git a/templates/vehicle/form.html.twig b/templates/vehicle/form.html.twig index e4ce3be3..1ff384ea 100644 --- a/templates/vehicle/form.html.twig +++ b/templates/vehicle/form.html.twig @@ -22,9 +22,9 @@

- {% if row is defined %} + {% if mode == 'update' %} Edit Vehicle - {{ row.getManufacturer().getName() ~ ' ' ~ row.getMake() ~ row.getModelYearFrom() ~ '-' ~ row.getModelYearTo() }} + {{ obj.getManufacturer().getName() ~ ' ' ~ obj.getMake() ~ obj.getModelYearFrom() ~ '-' ~ obj.getModelYearTo() }} {% else %} New Vehicle {% endif %} @@ -32,7 +32,7 @@

- +
@@ -43,7 +43,7 @@ @@ -54,7 +54,7 @@ Make:
- +
@@ -63,19 +63,19 @@ Year:
- {% for year in years %} - + {% endfor %} - {% for year in years %} - + {% endfor %}