From 69b02f2fe88fc9da10acf7cb03e5cb431989a88f Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 18 Jan 2017 20:00:37 +0000 Subject: [PATCH] Bug 17855 -Removed HTML regexes from all fields on all screens of onboarding tool except branchcode, patron category code and item type code. Also ensured these three remaining regexes are all {1,10} for length as they are all required. --- .../prog/en/modules/onboarding/onboardingstep1.tt | 4 +-- .../prog/en/modules/onboarding/onboardingstep2.tt | 29 +++++++------------- .../prog/en/modules/onboarding/onboardingstep3.tt | 32 +++------------------- .../prog/en/modules/onboarding/onboardingstep4.tt | 4 +-- 4 files changed, 18 insertions(+), 51 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt index 18cff8c..3653222 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -65,12 +65,12 @@
  1. - + Required
  2. - + Required
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index 453d96a..8f64453 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -166,30 +166,20 @@ $(document).ready(function(){ @@ -38,19 +35,6 @@ jQuery.validator.addMethod( "password_match", function(value,element){ }, MSG_PASSWORD_MISMATCH ); -jQuery.validator.addMethod( "letters_only", function(value,element){ - var patt =/^[a-zA-Z- ]+$/g; - if (patt.test(element.value)){ - return true; - } else { - return false; - } - }, MSG_DESCRIPTION_LETTERS_ONLY -); - - - - $(document).ready(function(){ $("#Submit").click(function(){ @@ -58,11 +42,9 @@ $(document).ready(function(){ rules: { surname: { required: true, - letters_only: true }, firstname: { required: true, - letters_only: true }, cardnumber: { required: true, @@ -72,12 +54,6 @@ $(document).ready(function(){ } }, messages: { - surname: { - required: MSG_DESCRIPTION_LETTERS_ONLY - }, - firstname: { - required: MSG_DESCRIPTION_LETTERS_ONLY - }, password: { required: MSG_PASSWORD_MISMATCH }, @@ -152,12 +128,12 @@ $(document).ready(function(){

Patron identity

  • - + Required
  • - + Required
  • @@ -210,12 +186,12 @@ $(document).ready(function(){
  • - + Required
  • - + Required
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt index ce5a48f..321eb8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -50,13 +50,13 @@
    1. - + Required
    2. - + Required
    -- 2.1.4