From 4db3ee025ca1bcd6168e48f3a282a7a1d06a4c63 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Thu, 24 May 2018 18:21:03 +0200
Subject: [PATCH] validate form on submit

---
 lib/AccountManager/L10N/fr.pm             | 1 +
 templates/web/complete_challenge.tt2.html | 9 ++++++++-
 templates/web/select_email.tt2.html       | 9 ++++++++-
 templates/web/select_federation.tt2.html  | 9 ++++++++-
 templates/web/select_sp.tt2.html          | 6 ++++--
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index 5e05cf0..8add812 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -76,6 +76,7 @@ our %Lexicon = (
     "Select the federation corresponding to the service you want to test:" => "Sélectionner la fédération correspondant au service à tester:",
     "As part of the GÉANT 2020 Framework Partnership Agreement (FPA), this project receives funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No. 731122 (GN4-2)." => "En tant que membre de l'accord GÉANT 2020 Framework Partnership Agreement (FPA), ce projet bénéficie d'un financement du programme de recherche de l'Union Européenne Horizon 2020 sous l'agrément No. 731122 (GN4-2).",
     "Test another service" => "Tester un autre service",
+    "This field is required" => "Ce champ est requis",
 );
 
 1;
diff --git a/templates/web/complete_challenge.tt2.html b/templates/web/complete_challenge.tt2.html
index adb2ff7..0402e2d 100644
--- a/templates/web/complete_challenge.tt2.html
+++ b/templates/web/complete_challenge.tt2.html
@@ -24,8 +24,15 @@
     </div>
 
     <div class="actions clearfix">
-        <button type="submit" class="button" name="action" value="select_email">[% lh.maketext("Previous") %]</button>
+        <button type="submit" class="button" name="action" value="select_email" novalidate>[% lh.maketext("Previous") %]</button>
         <button type="submit" class="button" name="action" value="create_accounts">[% lh.maketext("Next") %]</button>
     </div>
 </form>
+
+<script type="text/javascript">
+$( document ).ready(function() {
+    $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+    $("form").validate();
+});
+</script>
 [% END %]
diff --git a/templates/web/select_email.tt2.html b/templates/web/select_email.tt2.html
index 010fd34..80f965e 100644
--- a/templates/web/select_email.tt2.html
+++ b/templates/web/select_email.tt2.html
@@ -32,8 +32,15 @@
     </div>
 
     <div class="actions clearfix">
-        <button type="submit" class="button" name="action" value="select_sp">[% lh.maketext("Previous") %]</button>
+        <button type="submit" class="button" name="action" value="select_sp" formnovalidate>[% lh.maketext("Previous") %]</button>
         <button type="submit" class="button" name="action" value="complete_challenge">[% lh.maketext("Next") %]</button>
     </div>
 </form>
+
+<script type="text/javascript">
+$( document ).ready(function() {
+    $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+    $("form").validate();
+});
+</script>
 [% END %]
diff --git a/templates/web/select_federation.tt2.html b/templates/web/select_federation.tt2.html
index 02666bb..bc65ca5 100644
--- a/templates/web/select_federation.tt2.html
+++ b/templates/web/select_federation.tt2.html
@@ -21,8 +21,15 @@
     </div>
 
     <div class="actions clearfix">
-        <button type="submit" class="button" name="action" value="">[% lh.maketext("Previous") %]</button>
+        <button type="submit" class="button" name="action" value="" formnovalidate>[% lh.maketext("Previous") %]</button>
         <button type="submit" class="button" name="action" value="select_sp">[% lh.maketext("Next") %]</button>
     </div>
 </form>
+
+<script type="text/javascript">
+$( document ).ready(function() {
+    $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+    $("form").validate();
+});
+</script>
 [% END %]
diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index c391299..d5be5fd 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -29,7 +29,7 @@
     </div>
 
     <div class="actions clearfix">
-        <button type="submit" class="button" name="action" value="select_federation">[% lh.maketext("Previous") %]</button>
+        <button type="submit" class="button" name="action" value="select_federation" novalidate>[% lh.maketext("Previous") %]</button>
         <button type="submit" class="button" name="action" value="select_email">[% lh.maketext("Next") %]</button>
     </div>
 </form>
@@ -163,8 +163,10 @@ $( document ).ready(function() {
             this.element.show();
         }
     });
-
     $( "#entityid" ).combobox();
+
+    $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+    $("form").validate();
 });
 </script>
 [% END %]
-- 
GitLab