From 139d0d96dc0de90c76dbbc86f59d662b320cc2be Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Thu, 1 Aug 2013 16:14:41 +0200 Subject: [PATCH] Fix #1386 Remove extra field from register form --- lib/Alchemy/Phrasea/Controller/Root/Login.php | 10 +++++++++- www/scripts/apps/login/home/register.js | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index 70f293bbf5..d5643b14a9 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -237,7 +237,15 @@ class Login implements ControllerProviderInterface )); if ('POST' === $request->getMethod()) { - $form->bind($request); + $requestData = $request->request->all(); + + // Remove geocompleter field for validation this field is added client side + // with jquery geonames plugin + if (isset($requestData['geonameid']) && isset($requestData['geonameid-completer'])) { + unset($requestData['geonameid-completer']); + } + + $form->bind($requestData); $data = $form->getData(); $provider = null; diff --git a/www/scripts/apps/login/home/register.js b/www/scripts/apps/login/home/register.js index 5f0907ef06..bf20ef5098 100644 --- a/www/scripts/apps/login/home/register.js +++ b/www/scripts/apps/login/home/register.js @@ -91,7 +91,11 @@ require([ var geocompleter = geonames.init($("#geonameid"), { "server": $form.data("geonames-server-adress"), "limit": 40, - "init-input": false + "init-input": false, + "onInit": function(input, autoinput) { + // Set default name to geonameid-completer + autoinput.prop("name", "geonameid-completer"); + } }); // Positioning menu below input