From 9d53b4a3b42e8b3e16d2c27c0c3498a02468ba6b Mon Sep 17 00:00:00 2001 From: SamuelFelton Date: Fri, 16 Dec 2016 18:23:12 +0100 Subject: [PATCH 1/5] fixed typo and changed the 'Annuler' button to reflect the type of tournament --- src/InsaLan/TournamentBundle/Controller/UserController.php | 2 +- .../Resources/views/Part/ChoiceTeamActive.html.twig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/InsaLan/TournamentBundle/Controller/UserController.php b/src/InsaLan/TournamentBundle/Controller/UserController.php index 89df8eac..cd31f108 100644 --- a/src/InsaLan/TournamentBundle/Controller/UserController.php +++ b/src/InsaLan/TournamentBundle/Controller/UserController.php @@ -241,7 +241,7 @@ public function setPlayerAction(Request $request, Entity\Tournament $tournament) /** * * @Route("/{tournament}/user/player/registerOtherPlatform/") - * @Template("InsaLanTournamentBundle:User:redirectToAPiLogin.html.twig") + * @Template("InsaLanTournamentBundle:User:redirectToApiLogin.html.twig") */ public function redirectToApiLoginAction(Request $request, Entity\Tournament $tournament) { diff --git a/src/InsaLan/TournamentBundle/Resources/views/Part/ChoiceTeamActive.html.twig b/src/InsaLan/TournamentBundle/Resources/views/Part/ChoiceTeamActive.html.twig index 850cd7c9..0693390b 100644 --- a/src/InsaLan/TournamentBundle/Resources/views/Part/ChoiceTeamActive.html.twig +++ b/src/InsaLan/TournamentBundle/Resources/views/Part/ChoiceTeamActive.html.twig @@ -15,7 +15,11 @@