Use renderForm for proper return codes for turbo

This commit is contained in:
Jan Böhmer 2022-03-04 21:20:18 +01:00
parent 3a21c18ba9
commit ae24fb5eb1
7 changed files with 29 additions and 29 deletions

View file

@ -263,9 +263,9 @@ abstract class BaseAdminController extends AbstractController
/** @var AbstractPartsContainingRepository $repo */ /** @var AbstractPartsContainingRepository $repo */
$repo = $this->entityManager->getRepository($this->entity_class); $repo = $this->entityManager->getRepository($this->entity_class);
return $this->render($this->twig_template, [ return $this->renderForm($this->twig_template, [
'entity' => $entity, 'entity' => $entity,
'form' => $form->createView(), 'form' => $form,
'route_base' => $this->route_base, 'route_base' => $this->route_base,
'datatable' => $table, 'datatable' => $table,
'pdf_data' => $pdf_data ?? null, 'pdf_data' => $pdf_data ?? null,
@ -397,9 +397,9 @@ abstract class BaseAdminController extends AbstractController
$em->flush(); $em->flush();
} }
return $this->render($this->twig_template, [ return $this->renderForm($this->twig_template, [
'entity' => $new_entity, 'entity' => $new_entity,
'form' => $form->createView(), 'form' => $form,
'import_form' => $import_form->createView(), 'import_form' => $import_form->createView(),
'mass_creation_form' => $mass_creation_form->createView(), 'mass_creation_form' => $mass_creation_form->createView(),
'route_base' => $this->route_base, 'route_base' => $this->route_base,

View file

@ -127,8 +127,8 @@ class LabelController extends AbstractController
} }
} }
return $this->render('LabelSystem/dialog.html.twig', [ return $this->renderForm('LabelSystem/dialog.html.twig', [
'form' => $form->createView(), 'form' => $form,
'pdf_data' => $pdf_data, 'pdf_data' => $pdf_data,
'filename' => $filename, 'filename' => $filename,
'profile' => $profile, 'profile' => $profile,

View file

@ -189,11 +189,11 @@ class PartController extends AbstractController
$this->addFlash('error', 'part.edited_flash.invalid'); $this->addFlash('error', 'part.edited_flash.invalid');
} }
return $this->render('Parts/edit/edit_part_info.html.twig', return $this->renderForm('Parts/edit/edit_part_info.html.twig',
[ [
'part' => $part, 'part' => $part,
'form' => $form->createView(), 'form' => $form,
]); ]);
} }
/** /**
@ -313,10 +313,10 @@ class PartController extends AbstractController
$this->addFlash('error', 'part.created_flash.invalid'); $this->addFlash('error', 'part.created_flash.invalid');
} }
return $this->render('Parts/edit/new_part.html.twig', return $this->renderForm('Parts/edit/new_part.html.twig',
[ [
'part' => $new_part, 'part' => $new_part,
'form' => $form->createView(), 'form' => $form,
]); ]);
} }
} }

View file

@ -72,8 +72,8 @@ class ScanController extends AbstractController
} }
} }
return $this->render('LabelSystem/Scanner/dialog.html.twig', [ return $this->renderForm('LabelSystem/Scanner/dialog.html.twig', [
'form' => $form->createView(), 'form' => $form,
]); ]);
} }

View file

@ -131,8 +131,8 @@ class SecurityController extends AbstractController
return $this->redirectToRoute('login'); return $this->redirectToRoute('login');
} }
return $this->render('security/pw_reset_request.html.twig', [ return $this->renderForm('security/pw_reset_request.html.twig', [
'form' => $form->createView(), 'form' => $form,
]); ]);
} }
@ -203,8 +203,8 @@ class SecurityController extends AbstractController
} }
} }
return $this->render('security/pw_reset_new_pw.html.twig', [ return $this->renderForm('security/pw_reset_new_pw.html.twig', [
'form' => $form->createView(), 'form' => $form,
]); ]);
} }

View file

@ -239,10 +239,10 @@ class UserController extends AdminPages\BaseAdminController
'data' => $user, 'data' => $user,
]); ]);
return $this->render('Users/user_info.html.twig', [ return $this->renderForm('Users/user_info.html.twig', [
'user' => $user, 'user' => $user,
'avatar' => $avatar, 'avatar' => $avatar,
'form' => $builder->getForm()->createView(), 'form' => $builder->getForm(),
'datatable' => $table, 'datatable' => $table,
]); ]);
} }

View file

@ -350,14 +350,14 @@ class UserSettingsController extends AbstractController
* Output both forms * Output both forms
*****************************/ *****************************/
return $this->render('Users/user_settings.html.twig', [ return $this->renderForm('Users/user_settings.html.twig', [
'user' => $user, 'user' => $user,
'settings_form' => $form->createView(), 'settings_form' => $form,
'pw_form' => $pw_form->createView(), 'pw_form' => $pw_form,
'page_need_reload' => $page_need_reload, 'page_need_reload' => $page_need_reload,
'google_form' => $google_form->createView(), 'google_form' => $google_form,
'backup_form' => $backup_form->createView(), 'backup_form' => $backup_form,
'tfa_google' => [ 'tfa_google' => [
'enabled' => $google_enabled, 'enabled' => $google_enabled,
'qrContent' => $googleAuthenticator->getQRContent($user), 'qrContent' => $googleAuthenticator->getQRContent($user),