From ae24fb5eb10ee809536bc7eeaab02f62a627bf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Fri, 4 Mar 2022 21:20:18 +0100 Subject: [PATCH] Use renderForm for proper return codes for turbo --- .../AdminPages/BaseAdminController.php | 8 ++++---- src/Controller/LabelController.php | 4 ++-- src/Controller/PartController.php | 20 +++++++++---------- src/Controller/ScanController.php | 4 ++-- src/Controller/SecurityController.php | 8 ++++---- src/Controller/UserController.php | 4 ++-- src/Controller/UserSettingsController.php | 10 +++++----- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php index 8ce9bf5b..b11631db 100644 --- a/src/Controller/AdminPages/BaseAdminController.php +++ b/src/Controller/AdminPages/BaseAdminController.php @@ -263,9 +263,9 @@ abstract class BaseAdminController extends AbstractController /** @var AbstractPartsContainingRepository $repo */ $repo = $this->entityManager->getRepository($this->entity_class); - return $this->render($this->twig_template, [ + return $this->renderForm($this->twig_template, [ 'entity' => $entity, - 'form' => $form->createView(), + 'form' => $form, 'route_base' => $this->route_base, 'datatable' => $table, 'pdf_data' => $pdf_data ?? null, @@ -397,9 +397,9 @@ abstract class BaseAdminController extends AbstractController $em->flush(); } - return $this->render($this->twig_template, [ + return $this->renderForm($this->twig_template, [ 'entity' => $new_entity, - 'form' => $form->createView(), + 'form' => $form, 'import_form' => $import_form->createView(), 'mass_creation_form' => $mass_creation_form->createView(), 'route_base' => $this->route_base, diff --git a/src/Controller/LabelController.php b/src/Controller/LabelController.php index ac944f38..ef9c20f2 100644 --- a/src/Controller/LabelController.php +++ b/src/Controller/LabelController.php @@ -127,8 +127,8 @@ class LabelController extends AbstractController } } - return $this->render('LabelSystem/dialog.html.twig', [ - 'form' => $form->createView(), + return $this->renderForm('LabelSystem/dialog.html.twig', [ + 'form' => $form, 'pdf_data' => $pdf_data, 'filename' => $filename, 'profile' => $profile, diff --git a/src/Controller/PartController.php b/src/Controller/PartController.php index 06b82b62..dd28a401 100644 --- a/src/Controller/PartController.php +++ b/src/Controller/PartController.php @@ -189,11 +189,11 @@ class PartController extends AbstractController $this->addFlash('error', 'part.edited_flash.invalid'); } - return $this->render('Parts/edit/edit_part_info.html.twig', - [ - 'part' => $part, - 'form' => $form->createView(), - ]); + return $this->renderForm('Parts/edit/edit_part_info.html.twig', + [ + 'part' => $part, + 'form' => $form, + ]); } /** @@ -313,10 +313,10 @@ class PartController extends AbstractController $this->addFlash('error', 'part.created_flash.invalid'); } - return $this->render('Parts/edit/new_part.html.twig', - [ - 'part' => $new_part, - 'form' => $form->createView(), - ]); + return $this->renderForm('Parts/edit/new_part.html.twig', + [ + 'part' => $new_part, + 'form' => $form, + ]); } } diff --git a/src/Controller/ScanController.php b/src/Controller/ScanController.php index 880af1a6..2da4e71a 100644 --- a/src/Controller/ScanController.php +++ b/src/Controller/ScanController.php @@ -72,8 +72,8 @@ class ScanController extends AbstractController } } - return $this->render('LabelSystem/Scanner/dialog.html.twig', [ - 'form' => $form->createView(), + return $this->renderForm('LabelSystem/Scanner/dialog.html.twig', [ + 'form' => $form, ]); } diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php index f0058c8c..38fd9100 100644 --- a/src/Controller/SecurityController.php +++ b/src/Controller/SecurityController.php @@ -131,8 +131,8 @@ class SecurityController extends AbstractController return $this->redirectToRoute('login'); } - return $this->render('security/pw_reset_request.html.twig', [ - 'form' => $form->createView(), + return $this->renderForm('security/pw_reset_request.html.twig', [ + 'form' => $form, ]); } @@ -203,8 +203,8 @@ class SecurityController extends AbstractController } } - return $this->render('security/pw_reset_new_pw.html.twig', [ - 'form' => $form->createView(), + return $this->renderForm('security/pw_reset_new_pw.html.twig', [ + 'form' => $form, ]); } diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index bfb8e479..9000d3b0 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -239,10 +239,10 @@ class UserController extends AdminPages\BaseAdminController 'data' => $user, ]); - return $this->render('Users/user_info.html.twig', [ + return $this->renderForm('Users/user_info.html.twig', [ 'user' => $user, 'avatar' => $avatar, - 'form' => $builder->getForm()->createView(), + 'form' => $builder->getForm(), 'datatable' => $table, ]); } diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingsController.php index 0dd2e301..6ccaebf9 100644 --- a/src/Controller/UserSettingsController.php +++ b/src/Controller/UserSettingsController.php @@ -350,14 +350,14 @@ class UserSettingsController extends AbstractController * Output both forms *****************************/ - return $this->render('Users/user_settings.html.twig', [ + return $this->renderForm('Users/user_settings.html.twig', [ 'user' => $user, - 'settings_form' => $form->createView(), - 'pw_form' => $pw_form->createView(), + 'settings_form' => $form, + 'pw_form' => $pw_form, 'page_need_reload' => $page_need_reload, - 'google_form' => $google_form->createView(), - 'backup_form' => $backup_form->createView(), + 'google_form' => $google_form, + 'backup_form' => $backup_form, 'tfa_google' => [ 'enabled' => $google_enabled, 'qrContent' => $googleAuthenticator->getQRContent($user),